ARM: pxa/corgi: Remove hardcoded partitioning, use sharpslpart parser

With the introduction of sharpslpart partition parser we can now read the
offsets from NAND: we specify the list of the parsers as platform data, with
cmdlinepart and ofpart parsers first allowing to override the part. table
written in NAND. This is done here in the board file.

Emulators like qemu will need to pass the mtdparts in the cmdline.

Signed-off-by: Andrea Adami <andrea.adami@gmail.com>
Signed-off-by: Robert Jarzmik <robert.jarzmik@free.fr>

1 files changed, 8 insertions, 23 deletions

diff --git a/arch/arm/mach-pxa/corgi.c b/arch/arm/mach-pxa/corgi.c
index 5601ba5732f2..9a5a35e90769 100644
--- a/arch/arm/mach-pxa/corgi.c
+++ b/arch/arm/mach-pxa/corgi.c
@@ -606,24 +606,6 @@ static void __init corgi_init_spi(void)
 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 = {
@@ -633,10 +615,16 @@ static struct nand_bbt_descr sharpsl_bbt = {
         .pattern = scan_ff_pattern
 };
 
+static const char * const probes[] = {
+        "cmdlinepart",
+        "ofpart",
+        "sharpslpart",
+        NULL,
+};
+
 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),
+        .part_parsers           = probes,
 };
 
 static struct resource sharpsl_nand_resources[] = {
@@ -750,9 +738,6 @@ 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));
 
         regulator_has_full_constraints();