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-ep93xx | |
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-ep93xx')
-rw-r--r-- | arch/arm/mach-ep93xx/snappercl15.c | 3 | ||||
-rw-r--r-- | arch/arm/mach-ep93xx/ts72xx.c | 3 |
2 files changed, 0 insertions, 6 deletions
diff --git a/arch/arm/mach-ep93xx/snappercl15.c b/arch/arm/mach-ep93xx/snappercl15.c index 0c00852ef160..5df9092f1fcc 100644 --- a/arch/arm/mach-ep93xx/snappercl15.c +++ b/arch/arm/mach-ep93xx/snappercl15.c | |||
@@ -82,8 +82,6 @@ static int snappercl15_nand_dev_ready(struct mtd_info *mtd) | |||
82 | return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY); | 82 | return !!(__raw_readw(NAND_CTRL_ADDR(chip)) & SNAPPERCL15_NAND_RDY); |
83 | } | 83 | } |
84 | 84 | ||
85 | static const char *snappercl15_nand_part_probes[] = {"cmdlinepart", NULL}; | ||
86 | |||
87 | static struct mtd_partition snappercl15_nand_parts[] = { | 85 | static struct mtd_partition snappercl15_nand_parts[] = { |
88 | { | 86 | { |
89 | .name = "Kernel", | 87 | .name = "Kernel", |
@@ -100,7 +98,6 @@ static struct mtd_partition snappercl15_nand_parts[] = { | |||
100 | static struct platform_nand_data snappercl15_nand_data = { | 98 | static struct platform_nand_data snappercl15_nand_data = { |
101 | .chip = { | 99 | .chip = { |
102 | .nr_chips = 1, | 100 | .nr_chips = 1, |
103 | .part_probe_types = snappercl15_nand_part_probes, | ||
104 | .partitions = snappercl15_nand_parts, | 101 | .partitions = snappercl15_nand_parts, |
105 | .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), | 102 | .nr_partitions = ARRAY_SIZE(snappercl15_nand_parts), |
106 | .options = NAND_NO_AUTOINCR, | 103 | .options = NAND_NO_AUTOINCR, |
diff --git a/arch/arm/mach-ep93xx/ts72xx.c b/arch/arm/mach-ep93xx/ts72xx.c index 5ea790942e94..14d712175192 100644 --- a/arch/arm/mach-ep93xx/ts72xx.c +++ b/arch/arm/mach-ep93xx/ts72xx.c | |||
@@ -105,8 +105,6 @@ static int ts72xx_nand_device_ready(struct mtd_info *mtd) | |||
105 | return !!(__raw_readb(addr) & 0x20); | 105 | return !!(__raw_readb(addr) & 0x20); |
106 | } | 106 | } |
107 | 107 | ||
108 | static const char *ts72xx_nand_part_probes[] = { "cmdlinepart", NULL }; | ||
109 | |||
110 | #define TS72XX_BOOTROM_PART_SIZE (SZ_16K) | 108 | #define TS72XX_BOOTROM_PART_SIZE (SZ_16K) |
111 | #define TS72XX_REDBOOT_PART_SIZE (SZ_2M + SZ_1M) | 109 | #define TS72XX_REDBOOT_PART_SIZE (SZ_2M + SZ_1M) |
112 | 110 | ||
@@ -134,7 +132,6 @@ static struct platform_nand_data ts72xx_nand_data = { | |||
134 | .nr_chips = 1, | 132 | .nr_chips = 1, |
135 | .chip_offset = 0, | 133 | .chip_offset = 0, |
136 | .chip_delay = 15, | 134 | .chip_delay = 15, |
137 | .part_probe_types = ts72xx_nand_part_probes, | ||
138 | .partitions = ts72xx_nand_parts, | 135 | .partitions = ts72xx_nand_parts, |
139 | .nr_partitions = ARRAY_SIZE(ts72xx_nand_parts), | 136 | .nr_partitions = ARRAY_SIZE(ts72xx_nand_parts), |
140 | }, | 137 | }, |