diff options
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20-panel.c | 25 | ||||
| -rw-r--r-- | arch/arm/mach-tegra/board-colibri_t20-power.c | 6 |
2 files changed, 3 insertions, 28 deletions
diff --git a/arch/arm/mach-tegra/board-colibri_t20-panel.c b/arch/arm/mach-tegra/board-colibri_t20-panel.c index 006f668659cb..21a992252922 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-panel.c +++ b/arch/arm/mach-tegra/board-colibri_t20-panel.c @@ -113,31 +113,6 @@ static struct platform_device colibri_t20_backlight_device = { #ifdef CONFIG_TEGRA_DC static int colibri_t20_panel_enable(void) { - struct regulator *reg = regulator_get(NULL, "vdd_ldo4"); - - if (!reg) { - regulator_enable(reg); - regulator_put(reg); - } - - reg = regulator_get(NULL, "avdd_vdac"); - pr_info("LDO6: %d\n", regulator_get_voltage(reg)); - regulator_set_voltage(reg, 2850000, 2850000); - pr_info("LDO6: %d\n", regulator_get_voltage(reg)); - regulator_enable(reg); - - reg = regulator_get(NULL, "avdd_hdmi"); - pr_info("LDO7: %d\n", regulator_get_voltage(reg)); - regulator_set_voltage(reg, 3300000, 3300000); - pr_info("LDO7: %d\n", regulator_get_voltage(reg)); - regulator_enable(reg); - - reg = regulator_get(NULL, "avdd_hdmi_pll"); - pr_info("LDO8: %d\n", regulator_get_voltage(reg)); - regulator_set_voltage(reg, 1800000, 1800000); - pr_info("LDO8: %d\n", regulator_get_voltage(reg)); - regulator_enable(reg); - return 0; } diff --git a/arch/arm/mach-tegra/board-colibri_t20-power.c b/arch/arm/mach-tegra/board-colibri_t20-power.c index 33822adc2ef7..fb6e8e8e1bf3 100644 --- a/arch/arm/mach-tegra/board-colibri_t20-power.c +++ b/arch/arm/mach-tegra/board-colibri_t20-power.c @@ -167,9 +167,9 @@ static struct regulator_init_data ldo2_data = REGULATOR_INIT(ldo2, 725, 1500, OF static struct regulator_init_data ldo3_data = REGULATOR_INIT(ldo3, 1250, 3300, OFF, NULL); static struct regulator_init_data ldo4_data = REGULATOR_INIT(ldo4, 1700, 2475, ON, NULL); static struct regulator_init_data ldo5_data = REGULATOR_INIT(ldo5, 1250, 3300, ON, NULL); -static struct regulator_init_data ldo6_data = REGULATOR_INIT(ldo6, 1250, 3300, OFF, NULL); -static struct regulator_init_data ldo7_data = REGULATOR_INIT(ldo7, 1250, 3300, OFF, NULL); -static struct regulator_init_data ldo8_data = REGULATOR_INIT(ldo8, 1250, 3300, OFF, NULL); +static struct regulator_init_data ldo6_data = REGULATOR_INIT(ldo6, 2850, 2850, OFF, NULL); +static struct regulator_init_data ldo7_data = REGULATOR_INIT(ldo7, 3300, 3300, OFF, NULL); +static struct regulator_init_data ldo8_data = REGULATOR_INIT(ldo8, 1800, 1800, OFF, NULL); static struct regulator_init_data ldo9_data = REGULATOR_INIT(ldo9, 1250, 3300, OFF, NULL); static struct tps6586x_rtc_platform_data rtc_data = { |