diff options
author | H Hartley Sweeten <hartleys@visionengravers.com> | 2012-03-28 14:13:09 -0400 |
---|---|---|
committer | David Woodhouse <David.Woodhouse@intel.com> | 2012-05-13 23:47:06 -0400 |
commit | 60f8291003844a42b6edd4d8f37b2995c9431b57 (patch) | |
tree | 8c4a6f56d6f4f13f27d89a2a6582e344b360a701 /arch/arm/mach-pxa | |
parent | f2e5a24480023db86ebd455c807aa30dc224ba9a (diff) |
arm: 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>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Alexander Clouter <alex@digriz.org.uk>
Acked-by: Marek Vasut <marek.vasut@gmail.com>
Signed-off-by: Artem Bityutskiy <artem.bityutskiy@linux.intel.com>
Signed-off-by: David Woodhouse <David.Woodhouse@intel.com>
Diffstat (limited to 'arch/arm/mach-pxa')
-rw-r--r-- | arch/arm/mach-pxa/balloon3.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/em-x270.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-pxa/palmtx.c | 3 |
3 files changed, 0 insertions, 9 deletions
diff --git a/arch/arm/mach-pxa/balloon3.c b/arch/arm/mach-pxa/balloon3.c index c35456f02acb..7ece2625914c 100644 --- a/arch/arm/mach-pxa/balloon3.c +++ b/arch/arm/mach-pxa/balloon3.c | |||
@@ -679,8 +679,6 @@ static struct mtd_partition balloon3_partition_info[] = { | |||
679 | }, | 679 | }, |
680 | }; | 680 | }; |
681 | 681 | ||
682 | static const char *balloon3_part_probes[] = { "cmdlinepart", NULL }; | ||
683 | |||
684 | struct platform_nand_data balloon3_nand_pdata = { | 682 | struct platform_nand_data balloon3_nand_pdata = { |
685 | .chip = { | 683 | .chip = { |
686 | .nr_chips = 4, | 684 | .nr_chips = 4, |
@@ -688,7 +686,6 @@ struct platform_nand_data balloon3_nand_pdata = { | |||
688 | .nr_partitions = ARRAY_SIZE(balloon3_partition_info), | 686 | .nr_partitions = ARRAY_SIZE(balloon3_partition_info), |
689 | .partitions = balloon3_partition_info, | 687 | .partitions = balloon3_partition_info, |
690 | .chip_delay = 50, | 688 | .chip_delay = 50, |
691 | .part_probe_types = balloon3_part_probes, | ||
692 | }, | 689 | }, |
693 | .ctrl = { | 690 | .ctrl = { |
694 | .hwcontrol = 0, | 691 | .hwcontrol = 0, |
diff --git a/arch/arm/mach-pxa/em-x270.c b/arch/arm/mach-pxa/em-x270.c index 16ec557b8e43..2771ad43e258 100644 --- a/arch/arm/mach-pxa/em-x270.c +++ b/arch/arm/mach-pxa/em-x270.c | |||
@@ -338,8 +338,6 @@ static struct mtd_partition em_x270_partition_info[] = { | |||
338 | }, | 338 | }, |
339 | }; | 339 | }; |
340 | 340 | ||
341 | static const char *em_x270_part_probes[] = { "cmdlinepart", NULL }; | ||
342 | |||
343 | struct platform_nand_data em_x270_nand_platdata = { | 341 | struct platform_nand_data em_x270_nand_platdata = { |
344 | .chip = { | 342 | .chip = { |
345 | .nr_chips = 1, | 343 | .nr_chips = 1, |
@@ -347,7 +345,6 @@ struct platform_nand_data em_x270_nand_platdata = { | |||
347 | .nr_partitions = ARRAY_SIZE(em_x270_partition_info), | 345 | .nr_partitions = ARRAY_SIZE(em_x270_partition_info), |
348 | .partitions = em_x270_partition_info, | 346 | .partitions = em_x270_partition_info, |
349 | .chip_delay = 20, | 347 | .chip_delay = 20, |
350 | .part_probe_types = em_x270_part_probes, | ||
351 | }, | 348 | }, |
352 | .ctrl = { | 349 | .ctrl = { |
353 | .hwcontrol = 0, | 350 | .hwcontrol = 0, |
diff --git a/arch/arm/mach-pxa/palmtx.c b/arch/arm/mach-pxa/palmtx.c index 9507605ed547..0da35dccfd89 100644 --- a/arch/arm/mach-pxa/palmtx.c +++ b/arch/arm/mach-pxa/palmtx.c | |||
@@ -268,8 +268,6 @@ static struct mtd_partition palmtx_partition_info[] = { | |||
268 | }, | 268 | }, |
269 | }; | 269 | }; |
270 | 270 | ||
271 | static const char *palmtx_part_probes[] = { "cmdlinepart", NULL }; | ||
272 | |||
273 | struct platform_nand_data palmtx_nand_platdata = { | 271 | struct platform_nand_data palmtx_nand_platdata = { |
274 | .chip = { | 272 | .chip = { |
275 | .nr_chips = 1, | 273 | .nr_chips = 1, |
@@ -277,7 +275,6 @@ struct platform_nand_data palmtx_nand_platdata = { | |||
277 | .nr_partitions = ARRAY_SIZE(palmtx_partition_info), | 275 | .nr_partitions = ARRAY_SIZE(palmtx_partition_info), |
278 | .partitions = palmtx_partition_info, | 276 | .partitions = palmtx_partition_info, |
279 | .chip_delay = 20, | 277 | .chip_delay = 20, |
280 | .part_probe_types = palmtx_part_probes, | ||
281 | }, | 278 | }, |
282 | .ctrl = { | 279 | .ctrl = { |
283 | .cmd_ctrl = palmtx_nand_cmd_ctl, | 280 | .cmd_ctrl = palmtx_nand_cmd_ctl, |