diff options
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r-- | arch/arm/mach-omap2/board-omap3evm.c | 50 |
1 files changed, 7 insertions, 43 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c index 1ca298a1762..c452b3f3331 100644 --- a/arch/arm/mach-omap2/board-omap3evm.c +++ b/arch/arm/mach-omap2/board-omap3evm.c | |||
@@ -430,45 +430,6 @@ static struct twl4030_keypad_data omap3evm_kp_data = { | |||
430 | .rep = 1, | 430 | .rep = 1, |
431 | }; | 431 | }; |
432 | 432 | ||
433 | static struct regulator_consumer_supply omap3_evm_vdda_dac_supply[] = { | ||
434 | REGULATOR_SUPPLY("vdda_dac", "omapdss_venc"), | ||
435 | }; | ||
436 | |||
437 | /* VDAC for DSS driving S-Video */ | ||
438 | static struct regulator_init_data omap3_evm_vdac = { | ||
439 | .constraints = { | ||
440 | .min_uV = 1800000, | ||
441 | .max_uV = 1800000, | ||
442 | .apply_uV = true, | ||
443 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
444 | | REGULATOR_MODE_STANDBY, | ||
445 | .valid_ops_mask = REGULATOR_CHANGE_MODE | ||
446 | | REGULATOR_CHANGE_STATUS, | ||
447 | }, | ||
448 | .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vdda_dac_supply), | ||
449 | .consumer_supplies = omap3_evm_vdda_dac_supply, | ||
450 | }; | ||
451 | |||
452 | /* VPLL2 for digital video outputs */ | ||
453 | static struct regulator_consumer_supply omap3_evm_vpll2_supplies[] = { | ||
454 | REGULATOR_SUPPLY("vdds_dsi", "omapdss"), | ||
455 | REGULATOR_SUPPLY("vdds_dsi", "omapdss_dsi1"), | ||
456 | }; | ||
457 | |||
458 | static struct regulator_init_data omap3_evm_vpll2 = { | ||
459 | .constraints = { | ||
460 | .min_uV = 1800000, | ||
461 | .max_uV = 1800000, | ||
462 | .apply_uV = true, | ||
463 | .valid_modes_mask = REGULATOR_MODE_NORMAL | ||
464 | | REGULATOR_MODE_STANDBY, | ||
465 | .valid_ops_mask = REGULATOR_CHANGE_MODE | ||
466 | | REGULATOR_CHANGE_STATUS, | ||
467 | }, | ||
468 | .num_consumer_supplies = ARRAY_SIZE(omap3_evm_vpll2_supplies), | ||
469 | .consumer_supplies = omap3_evm_vpll2_supplies, | ||
470 | }; | ||
471 | |||
472 | /* ads7846 on SPI */ | 433 | /* ads7846 on SPI */ |
473 | static struct regulator_consumer_supply omap3evm_vio_supply[] = { | 434 | static struct regulator_consumer_supply omap3evm_vio_supply[] = { |
474 | REGULATOR_SUPPLY("vcc", "spi1.0"), | 435 | REGULATOR_SUPPLY("vcc", "spi1.0"), |
@@ -535,8 +496,6 @@ static struct twl4030_platform_data omap3evm_twldata = { | |||
535 | /* platform_data for children goes here */ | 496 | /* platform_data for children goes here */ |
536 | .keypad = &omap3evm_kp_data, | 497 | .keypad = &omap3evm_kp_data, |
537 | .gpio = &omap3evm_gpio_data, | 498 | .gpio = &omap3evm_gpio_data, |
538 | .vdac = &omap3_evm_vdac, | ||
539 | .vpll2 = &omap3_evm_vpll2, | ||
540 | .vio = &omap3evm_vio, | 499 | .vio = &omap3evm_vio, |
541 | .vmmc1 = &omap3evm_vmmc1, | 500 | .vmmc1 = &omap3evm_vmmc1, |
542 | .vsim = &omap3evm_vsim, | 501 | .vsim = &omap3evm_vsim, |
@@ -545,8 +504,13 @@ static struct twl4030_platform_data omap3evm_twldata = { | |||
545 | static int __init omap3_evm_i2c_init(void) | 504 | static int __init omap3_evm_i2c_init(void) |
546 | { | 505 | { |
547 | omap3_pmic_get_config(&omap3evm_twldata, | 506 | omap3_pmic_get_config(&omap3evm_twldata, |
548 | TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_MADC | | 507 | TWL_COMMON_PDATA_USB | TWL_COMMON_PDATA_MADC | |
549 | TWL_COMMON_PDATA_AUDIO, 0); | 508 | TWL_COMMON_PDATA_AUDIO, |
509 | TWL_COMMON_REGULATOR_VDAC | TWL_COMMON_REGULATOR_VPLL2); | ||
510 | |||
511 | omap3evm_twldata.vdac->constraints.apply_uV = true; | ||
512 | omap3evm_twldata.vpll2->constraints.apply_uV = true; | ||
513 | |||
550 | omap3_pmic_init("twl4030", &omap3evm_twldata); | 514 | omap3_pmic_init("twl4030", &omap3evm_twldata); |
551 | omap_register_i2c_bus(2, 400, NULL, 0); | 515 | omap_register_i2c_bus(2, 400, NULL, 0); |
552 | omap_register_i2c_bus(3, 400, NULL, 0); | 516 | omap_register_i2c_bus(3, 400, NULL, 0); |