diff mbox

[2/4] Bugfix to RX51 flash support: this board has no NOR flash,

Message ID 20090313180347.1548.57426.stgit@localhost (mailing list archive)
State Accepted
Commit 7ad710cd6907220b5617e87e42a8de2c04cb10b9
Headers show

Commit Message

Tony Lindgren March 13, 2009, 6:03 p.m. UTC 
From: David Brownell <dbrownell@users.sourceforge.net>

Signed-off-by: David Brownell <dbrownell@users.sourceforge.net>
Acked-by: Lauri Leukkunen <lauri.leukkunen@nokia.com>
---
 arch/arm/mach-omap2/board-rx51-flash.c |   37 +-------------------------------
 1 files changed, 1 insertions(+), 36 deletions(-)


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html

Comments

Tony Lindgren March 17, 2009, 4:14 p.m. UTC | #1 
This patch has been applied to the linux-omap
by youw fwiendly patch wobot.

Commit: 7ad710cd6907220b5617e87e42a8de2c04cb10b9

PatchWorks
http://patchwork.kernel.org/patch/11832/

Git
http://git.kernel.org/?p=linux/kernel/git/tmlind/linux-omap-2.6.git;a=commit;h=7ad710cd6907220b5617e87e42a8de2c04cb10b9


--
To unsubscribe from this list: send the line "unsubscribe linux-omap" in
the body of a message to majordomo@vger.kernel.org
More majordomo info at  http://vger.kernel.org/majordomo-info.html
diff mbox

Patch

diff --git a/arch/arm/mach-omap2/board-rx51-flash.c b/arch/arm/mach-omap2/board-rx51-flash.c
index cd030a6..39b0659 100644
--- a/arch/arm/mach-omap2/board-rx51-flash.c
+++ b/arch/arm/mach-omap2/board-rx51-flash.c
@@ -10,46 +10,12 @@ 
 
 #include <linux/kernel.h>
 #include <linux/init.h>
-#include <linux/platform_device.h>
-#include <linux/mtd/mtd.h>
-#include <linux/mtd/partitions.h>
-#include <asm/mach/flash.h>
-
-#include <mach/onenand.h>
+#include <linux/errno.h>
 
 #include "mmc-twl4030.h"
 
-#define	RX51_FLASH_CS	0
-
-extern struct mtd_partition n800_partitions[ONENAND_MAX_PARTITIONS];
-extern int n800_onenand_setup(void __iomem *onenand_base, int freq);
 extern void __init n800_flash_init(void);
 
-static struct flash_platform_data rx51_flash_data = {
-	.map_name	= "cfi_probe",
-	.width		= 2,
-	.parts		= n800_partitions,
-	.nr_parts	= ARRAY_SIZE(n800_partitions),
-};
-
-static struct resource rx51_flash_resource = {
-	.flags		= IORESOURCE_MEM,
-};
-
-static struct platform_device rx51_flash_device = {
-	.name		= "omapflash",
-	.id		= 0,
-	.dev		= {
-		.platform_data	= &rx51_flash_data,
-	},
-	.num_resources	= 1,
-	.resource	= &rx51_flash_resource,
-};
-
-static struct platform_device *rx51_flash_devices[] = {
-	&rx51_flash_device,
-};
-
 static struct twl4030_hsmmc_info mmc[] __initdata = {
 	{
 		.name		= "external",
@@ -71,7 +37,6 @@  static struct twl4030_hsmmc_info mmc[] __initdata = {
 
 void __init rx51_flash_init(void)
 {
-	platform_add_devices(rx51_flash_devices, ARRAY_SIZE(rx51_flash_devices));
 	n800_flash_init();
 	twl4030_mmc_init(mmc);
 }