aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm
diff options
context:
space:
mode:
authorEnric Balletbo i Serra <eballetbo@gmail.com>2010-10-08 13:22:57 -0400
committerTony Lindgren <tony@atomide.com>2010-10-08 13:22:57 -0400
commit72f381ba0565b358dc10c67ff47728a2c9aa5457 (patch)
tree251181018ecd7ee7e5aac014046771132e9523be /arch/arm
parent91d139cf3630eff73f161494ee0c596472c11fef (diff)
omap3: Remove VMMC2 regulator on IGEP v2
VMMC2 regulator is configured but it's not used for the IGEP v2, so remove this regulator from board. Signed-off-by: Enric Balletbo i Serra <eballetbo@gmail.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm')
-rw-r--r--arch/arm/mach-omap2/board-igep0020.c26
1 files changed, 3 insertions, 23 deletions
diff --git a/arch/arm/mach-omap2/board-igep0020.c b/arch/arm/mach-omap2/board-igep0020.c
index cfd67bf0acd9..152f757779ab 100644
--- a/arch/arm/mach-omap2/board-igep0020.c
+++ b/arch/arm/mach-omap2/board-igep0020.c
@@ -261,10 +261,6 @@ static struct regulator_consumer_supply igep2_vmmc1_supply = {
261 .supply = "vmmc", 261 .supply = "vmmc",
262}; 262};
263 263
264static struct regulator_consumer_supply igep2_vmmc2_supply = {
265 .supply = "vmmc",
266};
267
268/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */ 264/* VMMC1 for OMAP VDD_MMC1 (i/o) and MMC1 card */
269static struct regulator_init_data igep2_vmmc1 = { 265static struct regulator_init_data igep2_vmmc1 = {
270 .constraints = { 266 .constraints = {
@@ -280,21 +276,6 @@ static struct regulator_init_data igep2_vmmc1 = {
280 .consumer_supplies = &igep2_vmmc1_supply, 276 .consumer_supplies = &igep2_vmmc1_supply,
281}; 277};
282 278
283/* VMMC2 for OMAP VDD_MMC2 (i/o) and MMC2 WIFI */
284static struct regulator_init_data igep2_vmmc2 = {
285 .constraints = {
286 .min_uV = 1850000,
287 .max_uV = 3150000,
288 .valid_modes_mask = REGULATOR_MODE_NORMAL
289 | REGULATOR_MODE_STANDBY,
290 .valid_ops_mask = REGULATOR_CHANGE_VOLTAGE
291 | REGULATOR_CHANGE_MODE
292 | REGULATOR_CHANGE_STATUS,
293 },
294 .num_consumer_supplies = 1,
295 .consumer_supplies = &igep2_vmmc2_supply,
296};
297
298static struct omap2_hsmmc_info mmc[] = { 279static struct omap2_hsmmc_info mmc[] = {
299 { 280 {
300 .mmc = 1, 281 .mmc = 1,
@@ -391,11 +372,11 @@ static int igep2_twl_gpio_setup(struct device *dev,
391 mmc[0].gpio_cd = gpio + 0; 372 mmc[0].gpio_cd = gpio + 0;
392 omap2_hsmmc_init(mmc); 373 omap2_hsmmc_init(mmc);
393 374
394 /* link regulators to MMC adapters ... we "know" the 375 /*
376 * link regulators to MMC adapters ... we "know" the
395 * regulators will be set up only *after* we return. 377 * regulators will be set up only *after* we return.
396 */ 378 */
397 igep2_vmmc1_supply.dev = mmc[0].dev; 379 igep2_vmmc1_supply.dev = mmc[0].dev;
398 igep2_vmmc2_supply.dev = mmc[1].dev;
399 380
400 /* 381 /*
401 * REVISIT: need ehci-omap hooks for external VBUS 382 * REVISIT: need ehci-omap hooks for external VBUS
@@ -537,7 +518,6 @@ static struct twl4030_platform_data igep2_twldata = {
537 .codec = &igep2_codec_data, 518 .codec = &igep2_codec_data,
538 .gpio = &igep2_twl4030_gpio_pdata, 519 .gpio = &igep2_twl4030_gpio_pdata,
539 .vmmc1 = &igep2_vmmc1, 520 .vmmc1 = &igep2_vmmc1,
540 .vmmc2 = &igep2_vmmc2,
541 .vpll2 = &igep2_vpll2, 521 .vpll2 = &igep2_vpll2,
542 522
543}; 523};