Commit 8b62b087 authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by David Woodhouse

mips: 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>
Signed-off-by: default avatarArtem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: default avatarDavid Woodhouse <David.Woodhouse@intel.com>
parent 3203907e
...@@ -212,8 +212,6 @@ static int au1200_nand_device_ready(struct mtd_info *mtd) ...@@ -212,8 +212,6 @@ static int au1200_nand_device_ready(struct mtd_info *mtd)
return __raw_readl((void __iomem *)MEM_STSTAT) & 1; return __raw_readl((void __iomem *)MEM_STSTAT) & 1;
} }
static const char *db1200_part_probes[] = { "cmdlinepart", NULL };
static struct mtd_partition db1200_nand_parts[] = { static struct mtd_partition db1200_nand_parts[] = {
{ {
.name = "NAND FS 0", .name = "NAND FS 0",
...@@ -234,7 +232,6 @@ struct platform_nand_data db1200_nand_platdata = { ...@@ -234,7 +232,6 @@ struct platform_nand_data db1200_nand_platdata = {
.nr_partitions = ARRAY_SIZE(db1200_nand_parts), .nr_partitions = ARRAY_SIZE(db1200_nand_parts),
.partitions = db1200_nand_parts, .partitions = db1200_nand_parts,
.chip_delay = 20, .chip_delay = 20,
.part_probe_types = db1200_part_probes,
}, },
.ctrl = { .ctrl = {
.dev_ready = au1200_nand_device_ready, .dev_ready = au1200_nand_device_ready,
......
...@@ -145,8 +145,6 @@ static int au1300_nand_device_ready(struct mtd_info *mtd) ...@@ -145,8 +145,6 @@ static int au1300_nand_device_ready(struct mtd_info *mtd)
return __raw_readl((void __iomem *)MEM_STSTAT) & 1; return __raw_readl((void __iomem *)MEM_STSTAT) & 1;
} }
static const char *db1300_part_probes[] = { "cmdlinepart", NULL };
static struct mtd_partition db1300_nand_parts[] = { static struct mtd_partition db1300_nand_parts[] = {
{ {
.name = "NAND FS 0", .name = "NAND FS 0",
...@@ -167,7 +165,6 @@ struct platform_nand_data db1300_nand_platdata = { ...@@ -167,7 +165,6 @@ struct platform_nand_data db1300_nand_platdata = {
.nr_partitions = ARRAY_SIZE(db1300_nand_parts), .nr_partitions = ARRAY_SIZE(db1300_nand_parts),
.partitions = db1300_nand_parts, .partitions = db1300_nand_parts,
.chip_delay = 20, .chip_delay = 20,
.part_probe_types = db1300_part_probes,
}, },
.ctrl = { .ctrl = {
.dev_ready = au1300_nand_device_ready, .dev_ready = au1300_nand_device_ready,
......
...@@ -149,8 +149,6 @@ static int au1550_nand_device_ready(struct mtd_info *mtd) ...@@ -149,8 +149,6 @@ static int au1550_nand_device_ready(struct mtd_info *mtd)
return __raw_readl((void __iomem *)MEM_STSTAT) & 1; return __raw_readl((void __iomem *)MEM_STSTAT) & 1;
} }
static const char *db1550_part_probes[] = { "cmdlinepart", NULL };
static struct mtd_partition db1550_nand_parts[] = { static struct mtd_partition db1550_nand_parts[] = {
{ {
.name = "NAND FS 0", .name = "NAND FS 0",
...@@ -171,7 +169,6 @@ struct platform_nand_data db1550_nand_platdata = { ...@@ -171,7 +169,6 @@ struct platform_nand_data db1550_nand_platdata = {
.nr_partitions = ARRAY_SIZE(db1550_nand_parts), .nr_partitions = ARRAY_SIZE(db1550_nand_parts),
.partitions = db1550_nand_parts, .partitions = db1550_nand_parts,
.chip_delay = 20, .chip_delay = 20,
.part_probe_types = db1550_part_probes,
}, },
.ctrl = { .ctrl = {
.dev_ready = au1550_nand_device_ready, .dev_ready = au1550_nand_device_ready,
......
...@@ -244,11 +244,6 @@ static struct platform_device pnx833x_sata_device = { ...@@ -244,11 +244,6 @@ static struct platform_device pnx833x_sata_device = {
.resource = pnx833x_sata_resources, .resource = pnx833x_sata_resources,
}; };
static const char *part_probes[] = {
"cmdlinepart",
NULL
};
static void static void
pnx833x_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) pnx833x_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl)
{ {
...@@ -268,7 +263,6 @@ static struct platform_nand_data pnx833x_flash_nand_data = { ...@@ -268,7 +263,6 @@ static struct platform_nand_data pnx833x_flash_nand_data = {
.chip = { .chip = {
.nr_chips = 1, .nr_chips = 1,
.chip_delay = 25, .chip_delay = 25,
.part_probe_types = part_probes,
}, },
.ctrl = { .ctrl = {
.cmd_ctrl = pnx833x_flash_nand_cmd_ctrl .cmd_ctrl = pnx833x_flash_nand_cmd_ctrl
......
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