diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-03-28 14:14:00 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-05-13 23:47:08 -0400 |
commit | 8b62b0877b4e08017341e591fa4c218a791e7a04 (patch) | |
tree | 8d94aed1ffb692686bc0f3bd9341ef5e1b6f8098 /arch | |
parent | 3203907e6308a34f208538e5ba4a8f48c0413946 (diff) |
mips: Use the plat_nand default partition parser
Use the default partition parser, cmdlinepart, provided by the plat_nand driver.
Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/mips/alchemy/devboards/db1200.c | 3 | ||||
-rw-r--r-- | arch/mips/alchemy/devboards/db1300.c | 3 | ||||
-rw-r--r-- | arch/mips/alchemy/devboards/db1550.c | 3 | ||||
-rw-r--r-- | arch/mips/pnx833x/common/platform.c | 6 |
4 files changed, 0 insertions, 15 deletions
diff --git a/arch/mips/alchemy/devboards/db1200.c b/arch/mips/alchemy/devboards/db1200.c index a83302b96c01..48bc4226e0c5 100644 --- a/arch/mips/alchemy/devboards/db1200.c +++ b/arch/mips/alchemy/devboards/db1200.c | |||
@@ -212,8 +212,6 @@ static int au1200_nand_device_ready(struct mtd_info *mtd) | |||
212 | return __raw_readl((void __iomem *)MEM_STSTAT) & 1; | 212 | return __raw_readl((void __iomem *)MEM_STSTAT) & 1; |
213 | } | 213 | } |
214 | 214 | ||
215 | static const char *db1200_part_probes[] = { "cmdlinepart", NULL }; | ||
216 | |||
217 | static struct mtd_partition db1200_nand_parts[] = { | 215 | static struct mtd_partition db1200_nand_parts[] = { |
218 | { | 216 | { |
219 | .name = "NAND FS 0", | 217 | .name = "NAND FS 0", |
@@ -234,7 +232,6 @@ struct platform_nand_data db1200_nand_platdata = { | |||
234 | .nr_partitions = ARRAY_SIZE(db1200_nand_parts), | 232 | .nr_partitions = ARRAY_SIZE(db1200_nand_parts), |
235 | .partitions = db1200_nand_parts, | 233 | .partitions = db1200_nand_parts, |
236 | .chip_delay = 20, | 234 | .chip_delay = 20, |
237 | .part_probe_types = db1200_part_probes, | ||
238 | }, | 235 | }, |
239 | .ctrl = { | 236 | .ctrl = { |
240 | .dev_ready = au1200_nand_device_ready, | 237 | .dev_ready = au1200_nand_device_ready, |
diff --git a/arch/mips/alchemy/devboards/db1300.c b/arch/mips/alchemy/devboards/db1300.c index 0893f2af0d01..c56e0246694e 100644 --- a/arch/mips/alchemy/devboards/db1300.c +++ b/arch/mips/alchemy/devboards/db1300.c | |||
@@ -145,8 +145,6 @@ static int au1300_nand_device_ready(struct mtd_info *mtd) | |||
145 | return __raw_readl((void __iomem *)MEM_STSTAT) & 1; | 145 | return __raw_readl((void __iomem *)MEM_STSTAT) & 1; |
146 | } | 146 | } |
147 | 147 | ||
148 | static const char *db1300_part_probes[] = { "cmdlinepart", NULL }; | ||
149 | |||
150 | static struct mtd_partition db1300_nand_parts[] = { | 148 | static struct mtd_partition db1300_nand_parts[] = { |
151 | { | 149 | { |
152 | .name = "NAND FS 0", | 150 | .name = "NAND FS 0", |
@@ -167,7 +165,6 @@ struct platform_nand_data db1300_nand_platdata = { | |||
167 | .nr_partitions = ARRAY_SIZE(db1300_nand_parts), | 165 | .nr_partitions = ARRAY_SIZE(db1300_nand_parts), |
168 | .partitions = db1300_nand_parts, | 166 | .partitions = db1300_nand_parts, |
169 | .chip_delay = 20, | 167 | .chip_delay = 20, |
170 | .part_probe_types = db1300_part_probes, | ||
171 | }, | 168 | }, |
172 | .ctrl = { | 169 | .ctrl = { |
173 | .dev_ready = au1300_nand_device_ready, | 170 | .dev_ready = au1300_nand_device_ready, |
diff --git a/arch/mips/alchemy/devboards/db1550.c b/arch/mips/alchemy/devboards/db1550.c index 6815d0783cd8..9eb79062f46e 100644 --- a/arch/mips/alchemy/devboards/db1550.c +++ b/arch/mips/alchemy/devboards/db1550.c | |||
@@ -149,8 +149,6 @@ static int au1550_nand_device_ready(struct mtd_info *mtd) | |||
149 | return __raw_readl((void __iomem *)MEM_STSTAT) & 1; | 149 | return __raw_readl((void __iomem *)MEM_STSTAT) & 1; |
150 | } | 150 | } |
151 | 151 | ||
152 | static const char *db1550_part_probes[] = { "cmdlinepart", NULL }; | ||
153 | |||
154 | static struct mtd_partition db1550_nand_parts[] = { | 152 | static struct mtd_partition db1550_nand_parts[] = { |
155 | { | 153 | { |
156 | .name = "NAND FS 0", | 154 | .name = "NAND FS 0", |
@@ -171,7 +169,6 @@ struct platform_nand_data db1550_nand_platdata = { | |||
171 | .nr_partitions = ARRAY_SIZE(db1550_nand_parts), | 169 | .nr_partitions = ARRAY_SIZE(db1550_nand_parts), |
172 | .partitions = db1550_nand_parts, | 170 | .partitions = db1550_nand_parts, |
173 | .chip_delay = 20, | 171 | .chip_delay = 20, |
174 | .part_probe_types = db1550_part_probes, | ||
175 | }, | 172 | }, |
176 | .ctrl = { | 173 | .ctrl = { |
177 | .dev_ready = au1550_nand_device_ready, | 174 | .dev_ready = au1550_nand_device_ready, |
diff --git a/arch/mips/pnx833x/common/platform.c b/arch/mips/pnx833x/common/platform.c index 87167dcc79fa..05a1d922cd60 100644 --- a/arch/mips/pnx833x/common/platform.c +++ b/arch/mips/pnx833x/common/platform.c | |||
@@ -244,11 +244,6 @@ static struct platform_device pnx833x_sata_device = { | |||
244 | .resource = pnx833x_sata_resources, | 244 | .resource = pnx833x_sata_resources, |
245 | }; | 245 | }; |
246 | 246 | ||
247 | static const char *part_probes[] = { | ||
248 | "cmdlinepart", | ||
249 | NULL | ||
250 | }; | ||
251 | |||
252 | static void | 247 | static void |
253 | pnx833x_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) | 248 | pnx833x_flash_nand_cmd_ctrl(struct mtd_info *mtd, int cmd, unsigned int ctrl) |
254 | { | 249 | { |
@@ -268,7 +263,6 @@ static struct platform_nand_data pnx833x_flash_nand_data = { | |||
268 | .chip = { | 263 | .chip = { |
269 | .nr_chips = 1, | 264 | .nr_chips = 1, |
270 | .chip_delay = 25, | 265 | .chip_delay = 25, |
271 | .part_probe_types = part_probes, | ||
272 | }, | 266 | }, |
273 | .ctrl = { | 267 | .ctrl = { |
274 | .cmd_ctrl = pnx833x_flash_nand_cmd_ctrl | 268 | .cmd_ctrl = pnx833x_flash_nand_cmd_ctrl |