Commit 60f82910 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by David Woodhouse

arm: Use the plat_nand default partition parser

Use the default partition parser, cmdlinepart, provided by the plat_nand driver.
Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
Acked-by: default avatarAlexander Clouter <alex@digriz.org.uk>
Acked-by: default avatarMarek Vasut <marek.vasut@gmail.com>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent f2e5a244
...@@ -82,8 +82,6 @@ static int snappercl15_nand_dev_ready(struct mtd_info *mtd) ...@@ -82,8 +82,6 @@ static int snappercl15_nand_dev_ready(struct mtd_info *mtd)
return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY); return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY);
} }
static const char *snappercl15_nand_part_probes[] = {"cmdlinepart", NULL};
static struct mtd_partition snappercl15_nand_parts[] = { static struct mtd_partition snappercl15_nand_parts[] = {
{ {
.name = "Kernel", .name = "Kernel",
...@@ -100,7 +98,6 @@ static struct mtd_partition snappercl15_nand_parts[] = { ...@@ -100,7 +98,6 @@ static struct mtd_partition snappercl15_nand_parts[] = {
static struct platform_nand_data snappercl15_nand_data = { static struct platform_nand_data snappercl15_nand_data = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
.part_probe_types = snappercl15_nand_part_probes,
.partitions = snappercl15_nand_parts, .partitions = snappercl15_nand_parts,
.nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts),
.options = NAND_NO_AUTOINCR, .options = NAND_NO_AUTOINCR,
......
...@@ -105,8 +105,6 @@ static int ts72xx_nand_device_ready(struct mtd_info *mtd) ...@@ -105,8 +105,6 @@ static int ts72xx_nand_device_ready(struct mtd_info *mtd)
return !!(__raw_readb(addr) & 0x20); return !!(__raw_readb(addr) & 0x20);
} }
static const char *ts72xx_nand_part_probes[] = { "cmdlinepart", NULL };
#define TS72XX_BOOTROM_PART_SIZE (SZ_16K) #define TS72XX_BOOTROM_PART_SIZE (SZ_16K)
#define TS72XX_REDBOOT_PART_SIZE (SZ_2M + SZ_1M) #define TS72XX_REDBOOT_PART_SIZE (SZ_2M + SZ_1M)
...@@ -134,7 +132,6 @@ static struct platform_nand_data ts72xx_nand_data = { ...@@ -134,7 +132,6 @@ static struct platform_nand_data ts72xx_nand_data = {
.nr_chips = 1, .nr_chips = 1,
.chip_offset = 0, .chip_offset = 0,
.chip_delay = 15, .chip_delay = 15,
.part_probe_types = ts72xx_nand_part_probes,
.partitions = ts72xx_nand_parts, .partitions = ts72xx_nand_parts,
.nr_partitions = ARRAY_SIZE(ts72xx_nand_parts), .nr_partitions = ARRAY_SIZE(ts72xx_nand_parts),
}, },
......
...@@ -60,8 +60,6 @@ static struct platform_device ixdp425_flash = { ...@@ -60,8 +60,6 @@ static struct platform_device ixdp425_flash = {
#if defined(CONFIG_MTD_NAND_PLATFORM) || \ #if defined(CONFIG_MTD_NAND_PLATFORM) || \
defined(CONFIG_MTD_NAND_PLATFORM_MODULE) defined(CONFIG_MTD_NAND_PLATFORM_MODULE)
const char *part_probes[] = { "cmdlinepart", NULL };
static struct mtd_partition ixdp425_partitions[] = { static struct mtd_partition ixdp425_partitions[] = {
{ {
.name = "ixp400 NAND FS 0", .name = "ixp400 NAND FS 0",
...@@ -101,7 +99,6 @@ static struct platform_nand_data ixdp425_flash_nand_data = { ...@@ -101,7 +99,6 @@ static struct platform_nand_data ixdp425_flash_nand_data = {
.nr_chips = 1, .nr_chips = 1,
.chip_delay = 30, .chip_delay = 30,
.options = NAND_NO_AUTOINCR, .options = NAND_NO_AUTOINCR,
.part_probe_types = part_probes,
.partitions = ixdp425_partitions, .partitions = ixdp425_partitions,
.nr_partitions = ARRAY_SIZE(ixdp425_partitions), .nr_partitions = ARRAY_SIZE(ixdp425_partitions),
}, },
......
...@@ -206,14 +206,11 @@ static int nand_dev_ready(struct mtd_info *mtd) ...@@ -206,14 +206,11 @@ static int nand_dev_ready(struct mtd_info *mtd)
return gpio_get_value(FSAMPLE_NAND_RB_GPIO_PIN); return gpio_get_value(FSAMPLE_NAND_RB_GPIO_PIN);
} }
static const char *part_probes[] = { "cmdlinepart", NULL };
static struct platform_nand_data nand_data = { static struct platform_nand_data nand_data = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
.chip_offset = 0, .chip_offset = 0,
.options = NAND_SAMSUNG_LP_OPTIONS, .options = NAND_SAMSUNG_LP_OPTIONS,
.part_probe_types = part_probes,
}, },
.ctrl = { .ctrl = {
.cmd_ctrl = nand_cmd_ctl, .cmd_ctrl = nand_cmd_ctl,
......
...@@ -200,8 +200,6 @@ static int h2_nand_dev_ready(struct mtd_info *mtd) ...@@ -200,8 +200,6 @@ static int h2_nand_dev_ready(struct mtd_info *mtd)
return gpio_get_value(H2_NAND_RB_GPIO_PIN); return gpio_get_value(H2_NAND_RB_GPIO_PIN);
} }
static const char *h2_part_probes[] = { "cmdlinepart", NULL };
static struct platform_nand_data h2_nand_platdata = { static struct platform_nand_data h2_nand_platdata = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
...@@ -209,7 +207,6 @@ static struct platform_nand_data h2_nand_platdata = { ...@@ -209,7 +207,6 @@ static struct platform_nand_data h2_nand_platdata = {
.nr_partitions = ARRAY_SIZE(h2_nand_partitions), .nr_partitions = ARRAY_SIZE(h2_nand_partitions),
.partitions = h2_nand_partitions, .partitions = h2_nand_partitions,
.options = NAND_SAMSUNG_LP_OPTIONS, .options = NAND_SAMSUNG_LP_OPTIONS,
.part_probe_types = h2_part_probes,
}, },
.ctrl = { .ctrl = {
.cmd_ctrl = h2_nand_cmd_ctl, .cmd_ctrl = h2_nand_cmd_ctl,
......
...@@ -202,8 +202,6 @@ static int nand_dev_ready(struct mtd_info *mtd) ...@@ -202,8 +202,6 @@ static int nand_dev_ready(struct mtd_info *mtd)
return gpio_get_value(H3_NAND_RB_GPIO_PIN); return gpio_get_value(H3_NAND_RB_GPIO_PIN);
} }
static const char *part_probes[] = { "cmdlinepart", NULL };
static struct platform_nand_data nand_platdata = { static struct platform_nand_data nand_platdata = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
...@@ -211,7 +209,6 @@ static struct platform_nand_data nand_platdata = { ...@@ -211,7 +209,6 @@ static struct platform_nand_data nand_platdata = {
.nr_partitions = ARRAY_SIZE(nand_partitions), .nr_partitions = ARRAY_SIZE(nand_partitions),
.partitions = nand_partitions, .partitions = nand_partitions,
.options = NAND_SAMSUNG_LP_OPTIONS, .options = NAND_SAMSUNG_LP_OPTIONS,
.part_probe_types = part_probes,
}, },
.ctrl = { .ctrl = {
.cmd_ctrl = nand_cmd_ctl, .cmd_ctrl = nand_cmd_ctl,
......
...@@ -164,14 +164,11 @@ static int nand_dev_ready(struct mtd_info *mtd) ...@@ -164,14 +164,11 @@ static int nand_dev_ready(struct mtd_info *mtd)
return gpio_get_value(P2_NAND_RB_GPIO_PIN); return gpio_get_value(P2_NAND_RB_GPIO_PIN);
} }
static const char *part_probes[] = { "cmdlinepart", NULL };
static struct platform_nand_data nand_data = { static struct platform_nand_data nand_data = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
.chip_offset = 0, .chip_offset = 0,
.options = NAND_SAMSUNG_LP_OPTIONS, .options = NAND_SAMSUNG_LP_OPTIONS,
.part_probe_types = part_probes,
}, },
.ctrl = { .ctrl = {
.cmd_ctrl = nand_cmd_ctl, .cmd_ctrl = nand_cmd_ctl,
......
...@@ -245,8 +245,6 @@ static void ts78xx_ts_nand_read_buf(struct mtd_info *mtd, ...@@ -245,8 +245,6 @@ static void ts78xx_ts_nand_read_buf(struct mtd_info *mtd,
readsb(io_base, buf, len); readsb(io_base, buf, len);
} }
const char *ts_nand_part_probes[] = { "cmdlinepart", NULL };
static struct mtd_partition ts78xx_ts_nand_parts[] = { static struct mtd_partition ts78xx_ts_nand_parts[] = {
{ {
.name = "mbr", .name = "mbr",
...@@ -271,7 +269,6 @@ static struct mtd_partition ts78xx_ts_nand_parts[] = { ...@@ -271,7 +269,6 @@ static struct mtd_partition ts78xx_ts_nand_parts[] = {
static struct platform_nand_data ts78xx_ts_nand_data = { static struct platform_nand_data ts78xx_ts_nand_data = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
.part_probe_types = ts_nand_part_probes,
.partitions = ts78xx_ts_nand_parts, .partitions = ts78xx_ts_nand_parts,
.nr_partitions = ARRAY_SIZE(ts78xx_ts_nand_parts), .nr_partitions = ARRAY_SIZE(ts78xx_ts_nand_parts),
.chip_delay = 15, .chip_delay = 15,
......
...@@ -679,8 +679,6 @@ static struct mtd_partition balloon3_partition_info[] = { ...@@ -679,8 +679,6 @@ static struct mtd_partition balloon3_partition_info[] = {
}, },
}; };
static const char *balloon3_part_probes[] = { "cmdlinepart", NULL };
struct platform_nand_data balloon3_nand_pdata = { struct platform_nand_data balloon3_nand_pdata = {
.chip = { .chip = {
.nr_chips = 4, .nr_chips = 4,
...@@ -688,7 +686,6 @@ struct platform_nand_data balloon3_nand_pdata = { ...@@ -688,7 +686,6 @@ struct platform_nand_data balloon3_nand_pdata = {
.nr_partitions = ARRAY_SIZE(balloon3_partition_info), .nr_partitions = ARRAY_SIZE(balloon3_partition_info),
.partitions = balloon3_partition_info, .partitions = balloon3_partition_info,
.chip_delay = 50, .chip_delay = 50,
.part_probe_types = balloon3_part_probes,
}, },
.ctrl = { .ctrl = {
.hwcontrol = 0, .hwcontrol = 0,
......
...@@ -338,8 +338,6 @@ static struct mtd_partition em_x270_partition_info[] = { ...@@ -338,8 +338,6 @@ static struct mtd_partition em_x270_partition_info[] = {
}, },
}; };
static const char *em_x270_part_probes[] = { "cmdlinepart", NULL };
struct platform_nand_data em_x270_nand_platdata = { struct platform_nand_data em_x270_nand_platdata = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
...@@ -347,7 +345,6 @@ struct platform_nand_data em_x270_nand_platdata = { ...@@ -347,7 +345,6 @@ struct platform_nand_data em_x270_nand_platdata = {
.nr_partitions = ARRAY_SIZE(em_x270_partition_info), .nr_partitions = ARRAY_SIZE(em_x270_partition_info),
.partitions = em_x270_partition_info, .partitions = em_x270_partition_info,
.chip_delay = 20, .chip_delay = 20,
.part_probe_types = em_x270_part_probes,
}, },
.ctrl = { .ctrl = {
.hwcontrol = 0, .hwcontrol = 0,
......
...@@ -268,8 +268,6 @@ static struct mtd_partition palmtx_partition_info[] = { ...@@ -268,8 +268,6 @@ static struct mtd_partition palmtx_partition_info[] = {
}, },
}; };
static const char *palmtx_part_probes[] = { "cmdlinepart", NULL };
struct platform_nand_data palmtx_nand_platdata = { struct platform_nand_data palmtx_nand_platdata = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
...@@ -277,7 +275,6 @@ struct platform_nand_data palmtx_nand_platdata = { ...@@ -277,7 +275,6 @@ struct platform_nand_data palmtx_nand_platdata = {
.nr_partitions = ARRAY_SIZE(palmtx_partition_info), .nr_partitions = ARRAY_SIZE(palmtx_partition_info),
.partitions = palmtx_partition_info, .partitions = palmtx_partition_info,
.chip_delay = 20, .chip_delay = 20,
.part_probe_types = palmtx_part_probes,
}, },
.ctrl = { .ctrl = {
.cmd_ctrl = palmtx_nand_cmd_ctl, .cmd_ctrl = palmtx_nand_cmd_ctl,
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment