ARM: Tegra: Roth: Dalmore: Resolve Backlight Conflicts
[linux-3.10.git] / arch / arm / mach-tegra / board-roth-power.c
index 64a3eb7..2fe289c 100644 (file)
@@ -187,6 +187,7 @@ static struct regulator_consumer_supply palmas_regen1_supply[] = {
        REGULATOR_SUPPLY("vdd_3v3_sys", NULL),
        REGULATOR_SUPPLY("vdd", "4-004c"),
        REGULATOR_SUPPLY("vdd", "0-004d"),
+       REGULATOR_SUPPLY("usb_vbus", "tegra-ehci.2"),
 };
 
 static struct regulator_consumer_supply palmas_regen2_supply[] = {
@@ -361,8 +362,8 @@ static struct regulator_consumer_supply fixed_reg_fan_5v0_supply[] = {
 };
 
 /* LCD_BL_EN GMI_AD10 */
-static struct regulator_consumer_supply fixed_reg_lcd_bl_supply[] = {
-       REGULATOR_SUPPLY("vdd_lcd_bl", NULL),
+static struct regulator_consumer_supply fixed_reg_lcd_bl_en_supply[] = {
+       REGULATOR_SUPPLY("vdd_lcd_bl_en", NULL),
 };
 
 /* Touch 3v3 GMI_AD13 */
@@ -436,7 +437,7 @@ FIXED_REG(1,        vdd_hdmi_5v0,   vdd_hdmi_5v0,
        palmas_rails(smps10),   0,      0,
        TEGRA_GPIO_PK1, false,  true,   0,      5000);
 
-FIXED_REG(2,   lcd_bl, lcd_bl,
+FIXED_REG(2,   lcd_bl_en,      lcd_bl_en,
        NULL,   0,      0,
        TEGRA_GPIO_PH2, false,  true,   0,      5000);
 
@@ -479,7 +480,7 @@ FIXED_REG(6,        com_1v8,        com_1v8,
 static struct platform_device *fixed_reg_devs_roth[] = {
        ADD_FIXED_REG(fan_5v0),
        ADD_FIXED_REG(vdd_hdmi_5v0),
-       ADD_FIXED_REG(lcd_bl),
+       ADD_FIXED_REG(lcd_bl_en),
        ADD_FIXED_REG(ts_3v3),
        ADD_FIXED_REG(com_3v3),
        ADD_FIXED_REG(sd_3v3),
@@ -536,7 +537,7 @@ static struct platform_device roth_pda_power_device = {
 static struct tegra_suspend_platform_data roth_suspend_data = {
        .cpu_timer      = 300,
        .cpu_off_timer  = 300,
-       .suspend_mode   = TEGRA_SUSPEND_NONE,
+       .suspend_mode   = TEGRA_SUSPEND_LP0,
        .core_timer     = 0x157e,
        .core_off_timer = 2000,
        .corereq_high   = true,
@@ -695,8 +696,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
        .sensor_data = {
                [TSENSE_CPU0] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,
@@ -705,8 +704,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
                },
                [TSENSE_CPU1] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,
@@ -715,8 +712,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
                },
                [TSENSE_CPU2] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,
@@ -725,8 +720,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
                },
                [TSENSE_CPU3] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,
@@ -735,8 +728,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
                },
                [TSENSE_MEM0] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,
@@ -745,8 +736,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
                },
                [TSENSE_MEM1] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,
@@ -755,8 +744,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
                },
                [TSENSE_GPU] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,
@@ -765,8 +752,6 @@ static struct soctherm_platform_data roth_soctherm_data = {
                },
                [TSENSE_PLLX] = {
                        .enable = true,
-                       .therm_a = 570,
-                       .therm_b = -744,
                        .tall = 16300,
                        .tiddq = 1,
                        .ten_count = 1,