4 files changed, 182 insertions, 86 deletions

diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 65558d6aa22..b65be8e7792 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -26,6 +26,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/spi/corgi_lcd.h>
+#include <linux/mtd/sharpsl.h>
 #include <video/w100fb.h>
 
 #include <asm/setup.h>
@@ -541,11 +542,61 @@ err_free_1:
 static inline void corgi_init_spi(void) {}
 #endif
 
+static struct mtd_partition sharpsl_nand_partitions[] = {
+        {
+                .name = "System Area",
+                .offset = 0,
+                .size = 7 * 1024 * 1024,
+        },
+        {
+                .name = "Root Filesystem",
+                .offset = 7 * 1024 * 1024,
+                .size = 25 * 1024 * 1024,
+        },
+        {
+                .name = "Home Filesystem",
+                .offset = MTDPART_OFS_APPEND,
+                .size = MTDPART_SIZ_FULL,
+        },
+};
+
+static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+static struct nand_bbt_descr sharpsl_bbt = {
+        .options = 0,
+        .offs = 4,
+        .len = 2,
+        .pattern = scan_ff_pattern
+};
+
+static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
+        .badblock_pattern       = &sharpsl_bbt,
+        .partitions             = sharpsl_nand_partitions,
+        .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
+};
+
+static struct resource sharpsl_nand_resources[] = {
+        {
+                .start  = 0x0C000000,
+                .end    = 0x0C000FFF,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device sharpsl_nand_device = {
+        .name           = "sharpsl-nand",
+        .id             = -1,
+        .resource       = sharpsl_nand_resources,
+        .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
+        .dev.platform_data      = &sharpsl_nand_platform_data,
+};
+
 static struct platform_device *devices[] __initdata = {
         &corgiscoop_device,
         &corgifb_device,
         &corgikbd_device,
         &corgiled_device,
+        &sharpsl_nand_device,
 };
 
 static void corgi_poweroff(void)
@@ -585,6 +636,9 @@ static void __init corgi_init(void)
 
         platform_scoop_config = &corgi_pcmcia_config;
 
+        if (machine_is_husky())
+                sharpsl_nand_partitions[1].size = 53 * 1024 * 1024;
+
         platform_add_devices(devices, ARRAY_SIZE(devices));
 }
 
diff --git a/arch/arm/mach-pxa/poodle.c b/arch/arm/mach-pxa/poodle.c
index 2e3bd8b1523..a45afdf2520 100644
--- a/arch/arm/mach-pxa/poodle.c
+++ b/arch/arm/mach-pxa/poodle.c
@@ -23,6 +23,7 @@
 #include <linux/gpio.h>
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
+#include <linux/mtd/sharpsl.h>
 
 #include <mach/hardware.h>
 #include <asm/mach-types.h>
@@ -413,9 +414,59 @@ static struct pxafb_mach_info poodle_fb_info = {
         .lcd_conn       = LCD_COLOR_TFT_16BPP,
 };
 
+static struct mtd_partition sharpsl_nand_partitions[] = {
+        {
+                .name = "System Area",
+                .offset = 0,
+                .size = 7 * 1024 * 1024,
+        },
+        {
+                .name = "Root Filesystem",
+                .offset = 7 * 1024 * 1024,
+                .size = 22 * 1024 * 1024,
+        },
+        {
+                .name = "Home Filesystem",
+                .offset = MTDPART_OFS_APPEND,
+                .size = MTDPART_SIZ_FULL,
+        },
+};
+
+static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+static struct nand_bbt_descr sharpsl_bbt = {
+        .options = 0,
+        .offs = 4,
+        .len = 2,
+        .pattern = scan_ff_pattern
+};
+
+static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
+        .badblock_pattern       = &sharpsl_bbt,
+        .partitions             = sharpsl_nand_partitions,
+        .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
+};
+
+static struct resource sharpsl_nand_resources[] = {
+        {
+                .start  = 0x0C000000,
+                .end    = 0x0C000FFF,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device sharpsl_nand_device = {
+        .name           = "sharpsl-nand",
+        .id             = -1,
+        .resource       = sharpsl_nand_resources,
+        .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
+        .dev.platform_data      = &sharpsl_nand_platform_data,
+};
+
 static struct platform_device *devices[] __initdata = {
         &poodle_locomo_device,
         &poodle_scoop_device,
+        &sharpsl_nand_device,
 };
 
 static void poodle_poweroff(void)
diff --git a/arch/arm/mach-pxa/spitz.c b/arch/arm/mach-pxa/spitz.c
index 524f656dc56..6ffa6134e10 100644
--- a/arch/arm/mach-pxa/spitz.c
+++ b/arch/arm/mach-pxa/spitz.c
@@ -30,6 +30,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/ads7846.h>
 #include <linux/spi/corgi_lcd.h>
+#include <linux/mtd/sharpsl.h>
 
 #include <asm/setup.h>
 #include <asm/memory.h>
@@ -595,11 +596,60 @@ static struct pxafb_mach_info spitz_pxafb_info = {
         .lcd_conn       = LCD_COLOR_TFT_16BPP | LCD_ALTERNATE_MAPPING,
 };
 
+static struct mtd_partition sharpsl_nand_partitions[] = {
+        {
+                .name = "System Area",
+                .offset = 0,
+                .size = 7 * 1024 * 1024,
+        },
+        {
+                .name = "Root Filesystem",
+                .offset = 7 * 1024 * 1024,
+        },
+        {
+                .name = "Home Filesystem",
+                .offset = MTDPART_OFS_APPEND,
+                .size = MTDPART_SIZ_FULL,
+        },
+};
+
+static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
+
+static struct nand_bbt_descr sharpsl_bbt = {
+        .options = 0,
+        .offs = 4,
+        .len = 2,
+        .pattern = scan_ff_pattern
+};
+
+static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
+        .badblock_pattern       = &sharpsl_bbt,
+        .partitions             = sharpsl_nand_partitions,
+        .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
+};
+
+static struct resource sharpsl_nand_resources[] = {
+        {
+                .start  = 0x0C000000,
+                .end    = 0x0C000FFF,
+                .flags  = IORESOURCE_MEM,
+        },
+};
+
+static struct platform_device sharpsl_nand_device = {
+        .name           = "sharpsl-nand",
+        .id             = -1,
+        .resource       = sharpsl_nand_resources,
+        .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
+        .dev.platform_data      = &sharpsl_nand_platform_data,
+};
+
 
 static struct platform_device *devices[] __initdata = {
         &spitzscoop_device,
         &spitzkbd_device,
         &spitzled_device,
+        &sharpsl_nand_device,
 };
 
 static void spitz_poweroff(void)
@@ -622,6 +672,14 @@ static void __init common_init(void)
         pm_power_off = spitz_poweroff;
         arm_pm_restart = spitz_restart;
 
+        if (machine_is_spitz()) {
+                sharpsl_nand_partitions[1].size = 5 * 1024 * 1024;
+        } else if (machine_is_akita()) {
+                sharpsl_nand_partitions[1].size = 58 * 1024 * 1024;
+        } else if (machine_is_borzoi()) {
+                sharpsl_nand_partitions[1].size = 32 * 1024 * 1024;
+        }
+
         PMCR = 0x00;
 
         /* Stop 3.6MHz and drive HIGH to PCMCIA and CS */
@@ -666,10 +724,29 @@ static struct i2c_board_info akita_i2c_board_info[] = {
         },
 };
 
+static struct nand_bbt_descr sharpsl_akita_bbt = {
+        .options = 0,
+        .offs = 4,
+        .len = 1,
+        .pattern = scan_ff_pattern
+};
+
+static struct nand_ecclayout akita_oobinfo = {
+        .eccbytes = 24,
+        .eccpos = {
+                   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
+                   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
+                   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
+        .oobfree = {{0x08, 0x09}}
+};
+
 static void __init akita_init(void)
 {
         spitz_ficp_platform_data.transceiver_mode = akita_irda_transceiver_mode;
 
+        sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
+        sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
+
         /* We just pretend the second element of the array doesn't exist */
         spitz_pcmcia_config.num_devs = 1;
         platform_scoop_config = &spitz_pcmcia_config;
diff --git a/drivers/mtd/nand/sharpsl.c b/drivers/mtd/nand/sharpsl.c
index 698378ca8e0..54ec7542a7b 100644
--- a/drivers/mtd/nand/sharpsl.c
+++ b/drivers/mtd/nand/sharpsl.c
@@ -247,93 +247,8 @@ static struct platform_driver sharpsl_nand_driver = {
         .remove         = __devexit_p(sharpsl_nand_remove),
 };
 
-/*
- * Define partitions for flash device
- */
-static struct mtd_partition sharpsl_nand_partitions[] = {
-        {
-         .name = "System Area",
-         .offset = 0,
-         .size = 7 * 1024 * 1024,
-         },
-        {
-         .name = "Root Filesystem",
-         .offset = 7 * 1024 * 1024,
-         .size = 30 * 1024 * 1024,
-         },
-        {
-         .name = "Home Filesystem",
-         .offset = MTDPART_OFS_APPEND,
-         .size = MTDPART_SIZ_FULL,
-         },
-};
-
-static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
-
-static struct nand_bbt_descr sharpsl_bbt = {
-        .options = 0,
-        .offs = 4,
-        .len = 2,
-        .pattern = scan_ff_pattern
-};
-
-static struct nand_bbt_descr sharpsl_akita_bbt = {
-        .options = 0,
-        .offs = 4,
-        .len = 1,
-        .pattern = scan_ff_pattern
-};
-
-static struct nand_ecclayout akita_oobinfo = {
-        .eccbytes = 24,
-        .eccpos = {
-                   0x5, 0x1, 0x2, 0x3, 0x6, 0x7, 0x15, 0x11,
-                   0x12, 0x13, 0x16, 0x17, 0x25, 0x21, 0x22, 0x23,
-                   0x26, 0x27, 0x35, 0x31, 0x32, 0x33, 0x36, 0x37},
-        .oobfree = {{0x08, 0x09}}
-};
-
-static struct sharpsl_nand_platform_data sharpsl_nand_platform_data = {
-        .badblock_pattern       = &sharpsl_bbt,
-        .partitions             = sharpsl_nand_partitions,
-        .nr_partitions          = ARRAY_SIZE(sharpsl_nand_partitions),
-};
-
-static struct resource sharpsl_nand_resources[] = {
-        {
-                .start  = 0x0C000000,
-                .end    = 0x0C000FFF,
-                .flags  = IORESOURCE_MEM,
-        },
-};
-
-static struct platform_device sharpsl_nand_device = {
-        .name           = "sharpsl-nand",
-        .id             = -1,
-        .resource       = sharpsl_nand_resources,
-        .num_resources  = ARRAY_SIZE(sharpsl_nand_resources),
-        .dev.platform_data      = &sharpsl_nand_platform_data,
-};
-
 static int __init sharpsl_nand_init(void)
 {
-        if (machine_is_poodle()) {
-                sharpsl_nand_partitions[1].size = 22 * 1024 * 1024;
-        } else if (machine_is_corgi() || machine_is_shepherd()) {
-                sharpsl_nand_partitions[1].size = 25 * 1024 * 1024;
-        } else if (machine_is_husky()) {
-                sharpsl_nand_partitions[1].size = 53 * 1024 * 1024;
-        } else if (machine_is_spitz()) {
-                sharpsl_nand_partitions[1].size = 5 * 1024 * 1024;
-        } else if (machine_is_akita()) {
-                sharpsl_nand_partitions[1].size = 58 * 1024 * 1024;
-                sharpsl_nand_platform_data.badblock_pattern = &sharpsl_akita_bbt;
-                sharpsl_nand_platform_data.ecc_layout = &akita_oobinfo;
-        } else if (machine_is_borzoi()) {
-                sharpsl_nand_partitions[1].size = 32 * 1024 * 1024;
-        }
-
-        platform_device_register(&sharpsl_nand_device);
         return platform_driver_register(&sharpsl_nand_driver);
 }
 module_init(sharpsl_nand_init);
@@ -341,7 +256,6 @@ module_init(sharpsl_nand_init);
 static void __exit sharpsl_nand_exit(void)
 {
         platform_driver_unregister(&sharpsl_nand_driver);
-        platform_device_unregister(&sharpsl_nand_device);
 }
 module_exit(sharpsl_nand_exit);