Merge tag 'trace-v4.16-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt...

[sfrench/cifs-2.6.git] / arch / arm / mach-pxa / tosa.c

diff --git a/arch/arm/mach-pxa/tosa.c b/arch/arm/mach-pxa/tosa.c
index 6a386fd6363ea7e03b83216443dd1dcb40554df0..cb5cd8e78c9400ced4b775e5fbb3b4fa81966315 100644 (file)
--- a/arch/arm/mach-pxa/tosa.c
+++ b/arch/arm/mach-pxa/tosa.c
@@ -35,7 +35,7 @@
 #include <linux/spi/spi.h>
 #include <linux/spi/pxa2xx_spi.h>
 #include <linux/input/matrix_keypad.h>
-#include <linux/i2c/pxa-i2c.h>
+#include <linux/platform_data/i2c-pxa.h>
 #include <linux/usb/gpio_vbus.h>
 #include <linux/reboot.h>
 #include <linux/memblock.h>
@@ -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)