aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-omap1
diff options
context:
space:
mode:
authorH Hartley Sweeten <hartleys@visionengravers.com>2012-03-28 14:13:09 -0400
committerDavid Woodhouse <David.Woodhouse@intel.com>2012-05-13 23:47:06 -0400
commit60f8291003844a42b6edd4d8f37b2995c9431b57 (patch)
tree8c4a6f56d6f4f13f27d89a2a6582e344b360a701 /arch/arm/mach-omap1
parentf2e5a24480023db86ebd455c807aa30dc224ba9a (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-omap1')
-rw-r--r--arch/arm/mach-omap1/board-fsample.c3
-rw-r--r--arch/arm/mach-omap1/board-h2.c3
-rw-r--r--arch/arm/mach-omap1/board-h3.c3
-rw-r--r--arch/arm/mach-omap1/board-perseus2.c3
4 files changed, 0 insertions, 12 deletions
diff --git a/arch/arm/mach-omap1/board-fsample.c b/arch/arm/mach-omap1/board-fsample.c
index 80bd43c7f4e..62a1e1122c3 100644
--- a/arch/arm/mach-omap1/board-fsample.c
+++ b/arch/arm/mach-omap1/board-fsample.c
@@ -206,14 +206,11 @@ static int nand_dev_ready(struct mtd_info *mtd)
206 return gpio_get_value(FSAMPLE_NAND_RB_GPIO_PIN); 206 return gpio_get_value(FSAMPLE_NAND_RB_GPIO_PIN);
207} 207}
208 208
209static const char *part_probes[] = { "cmdlinepart", NULL };
210
211static struct platform_nand_data nand_data = { 209static struct platform_nand_data nand_data = {
212 .chip = { 210 .chip = {
213 .nr_chips = 1, 211 .nr_chips = 1,
214 .chip_offset = 0, 212 .chip_offset = 0,
215 .options = NAND_SAMSUNG_LP_OPTIONS, 213 .options = NAND_SAMSUNG_LP_OPTIONS,
216 .part_probe_types = part_probes,
217 }, 214 },
218 .ctrl = { 215 .ctrl = {
219 .cmd_ctrl = nand_cmd_ctl, 216 .cmd_ctrl = nand_cmd_ctl,
diff --git a/arch/arm/mach-omap1/board-h2.c b/arch/arm/mach-omap1/board-h2.c
index 553a2e53576..9811b27ea16 100644
--- a/arch/arm/mach-omap1/board-h2.c
+++ b/arch/arm/mach-omap1/board-h2.c
@@ -200,8 +200,6 @@ static int h2_nand_dev_ready(struct mtd_info *mtd)
200 return gpio_get_value(H2_NAND_RB_GPIO_PIN); 200 return gpio_get_value(H2_NAND_RB_GPIO_PIN);
201} 201}
202 202
203static const char *h2_part_probes[] = { "cmdlinepart", NULL };
204
205static struct platform_nand_data h2_nand_platdata = { 203static struct platform_nand_data h2_nand_platdata = {
206 .chip = { 204 .chip = {
207 .nr_chips = 1, 205 .nr_chips = 1,
@@ -209,7 +207,6 @@ static struct platform_nand_data h2_nand_platdata = {
209 .nr_partitions = ARRAY_SIZE(h2_nand_partitions), 207 .nr_partitions = ARRAY_SIZE(h2_nand_partitions),
210 .partitions = h2_nand_partitions, 208 .partitions = h2_nand_partitions,
211 .options = NAND_SAMSUNG_LP_OPTIONS, 209 .options = NAND_SAMSUNG_LP_OPTIONS,
212 .part_probe_types = h2_part_probes,
213 }, 210 },
214 .ctrl = { 211 .ctrl = {
215 .cmd_ctrl = h2_nand_cmd_ctl, 212 .cmd_ctrl = h2_nand_cmd_ctl,
diff --git a/arch/arm/mach-omap1/board-h3.c b/arch/arm/mach-omap1/board-h3.c
index 4c19f4c0685..94858dc8c84 100644
--- a/arch/arm/mach-omap1/board-h3.c
+++ b/arch/arm/mach-omap1/board-h3.c
@@ -202,8 +202,6 @@ static int nand_dev_ready(struct mtd_info *mtd)
202 return gpio_get_value(H3_NAND_RB_GPIO_PIN); 202 return gpio_get_value(H3_NAND_RB_GPIO_PIN);
203} 203}
204 204
205static const char *part_probes[] = { "cmdlinepart", NULL };
206
207static struct platform_nand_data nand_platdata = { 205static struct platform_nand_data nand_platdata = {
208 .chip = { 206 .chip = {
209 .nr_chips = 1, 207 .nr_chips = 1,
@@ -211,7 +209,6 @@ static struct platform_nand_data nand_platdata = {
211 .nr_partitions = ARRAY_SIZE(nand_partitions), 209 .nr_partitions = ARRAY_SIZE(nand_partitions),
212 .partitions = nand_partitions, 210 .partitions = nand_partitions,
213 .options = NAND_SAMSUNG_LP_OPTIONS, 211 .options = NAND_SAMSUNG_LP_OPTIONS,
214 .part_probe_types = part_probes,
215 }, 212 },
216 .ctrl = { 213 .ctrl = {
217 .cmd_ctrl = nand_cmd_ctl, 214 .cmd_ctrl = nand_cmd_ctl,
diff --git a/arch/arm/mach-omap1/board-perseus2.c b/arch/arm/mach-omap1/board-perseus2.c
index 76d4ee05a81..eb8b2c7d871 100644
--- a/arch/arm/mach-omap1/board-perseus2.c
+++ b/arch/arm/mach-omap1/board-perseus2.c
@@ -164,14 +164,11 @@ static int nand_dev_ready(struct mtd_info *mtd)
164 return gpio_get_value(P2_NAND_RB_GPIO_PIN); 164 return gpio_get_value(P2_NAND_RB_GPIO_PIN);
165} 165}
166 166
167static const char *part_probes[] = { "cmdlinepart", NULL };
168
169static struct platform_nand_data nand_data = { 167static struct platform_nand_data nand_data = {
170 .chip = { 168 .chip = {
171 .nr_chips = 1, 169 .nr_chips = 1,
172 .chip_offset = 0, 170 .chip_offset = 0,
173 .options = NAND_SAMSUNG_LP_OPTIONS, 171 .options = NAND_SAMSUNG_LP_OPTIONS,
174 .part_probe_types = part_probes,
175 }, 172 },
176 .ctrl = { 173 .ctrl = {
177 .cmd_ctrl = nand_cmd_ctl, 174 .cmd_ctrl = nand_cmd_ctl,