ARM: pxa/tosa: 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>

diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index ecc050f29e3009256f8bee3cf23a65b1f8f72338..cb5cd8e78c9400ced4b775e5fbb3b4fa81966315 100644 (file)
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -673,24 +673,6 @@ static int tosa_tc6393xb_suspend(struct platform_device *dev)
        return 0;
 }
 
-static struct mtd_partition tosa_nand_partition[] = {
-       {
-               .name   = "smf",
-               .offset = 0,
-               .size   = 7 * 1024 * 1024,
-       },
-       {
-               .name   = "root",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = 28 * 1024 * 1024,
-       },
-       {
-               .name   = "home",
-               .offset = MTDPART_OFS_APPEND,
-               .size   = MTDPART_SIZ_FULL,
-       },
-};
-
 static uint8_t scan_ff_pattern[] = { 0xff, 0xff };
 
 static struct nand_bbt_descr tosa_tc6393xb_nand_bbt = {
@@ -700,10 +682,16 @@ static struct nand_bbt_descr tosa_tc6393xb_nand_bbt = {
        .pattern        = scan_ff_pattern
 };
 
+static const char * const probes[] = {
+       "cmdlinepart",
+       "ofpart",
+       "sharpslpart",
+       NULL,
+};
+
 static struct tmio_nand_data tosa_tc6393xb_nand_config = {
-       .num_partitions = ARRAY_SIZE(tosa_nand_partition),
-       .partition      = tosa_nand_partition,
        .badblock_pattern = &tosa_tc6393xb_nand_bbt,
+       .part_parsers = probes,
 };
 
 static int tosa_tc6393xb_setup(struct platform_device *dev)