ARM: Tegra: Roth: Dalmore: Resolve Backlight Conflicts
[linux-3.10.git] / arch / arm / mach-tegra / board-roth-power.c
index 2dd0c07..2fe289c 100644 (file)
@@ -112,6 +112,7 @@ static struct regulator_consumer_supply palmas_smps3_supply[] = {
        REGULATOR_SUPPLY("vddio_uart", NULL),
        REGULATOR_SUPPLY("pwrdet_uart", NULL),
        REGULATOR_SUPPLY("dbvdd", NULL),
+       REGULATOR_SUPPLY("dvdd_lcd", NULL),
 };
 
 static struct regulator_consumer_supply palmas_smps45_supply[] = {
@@ -142,12 +143,11 @@ static struct regulator_consumer_supply palmas_smps9_supply[] = {
 static struct regulator_consumer_supply palmas_smps10_supply[] = {
        REGULATOR_SUPPLY("usb_vbus", "tegra-ehci.0"),
        REGULATOR_SUPPLY("vdd_vbrtr", NULL),
-       REGULATOR_SUPPLY("vdd_lcd", NULL),
        REGULATOR_SUPPLY("vdd_5v0", NULL),
 };
 
 static struct regulator_consumer_supply palmas_ldo2_supply[] = {
-       REGULATOR_SUPPLY("vdd_2v8_display", NULL),
+       REGULATOR_SUPPLY("avdd_lcd", NULL),
        REGULATOR_SUPPLY("vci_2v8", NULL),
 };
 
@@ -160,6 +160,9 @@ static struct regulator_consumer_supply palmas_ldo3_supply[] = {
 
 static struct regulator_consumer_supply palmas_ldo6_supply[] = {
        REGULATOR_SUPPLY("vdd_sensor_2v85", NULL),
+       REGULATOR_SUPPLY("vdd", "0-004c"),
+       REGULATOR_SUPPLY("vdd", "1-004c"),
+       REGULATOR_SUPPLY("vdd", "1-004d"),
 };
 
 static struct regulator_consumer_supply palmas_ldo8_supply[] = {
@@ -183,8 +186,8 @@ static struct regulator_consumer_supply palmas_ldousb_supply[] = {
 static struct regulator_consumer_supply palmas_regen1_supply[] = {
        REGULATOR_SUPPLY("vdd_3v3_sys", NULL),
        REGULATOR_SUPPLY("vdd", "4-004c"),
-       REGULATOR_SUPPLY("vdd", "0-004c"),
        REGULATOR_SUPPLY("vdd", "0-004d"),
+       REGULATOR_SUPPLY("usb_vbus", "tegra-ehci.2"),
 };
 
 static struct regulator_consumer_supply palmas_regen2_supply[] = {
@@ -217,11 +220,11 @@ PALMAS_PDATA_INIT(smps12, 1200,  1500, NULL, 0, 0, 0);
 PALMAS_PDATA_INIT(smps3, 1800,  1800, NULL, 0, 0, 0);
 PALMAS_PDATA_INIT(smps45, 900,  1400, NULL, 1, 1, 0);
 PALMAS_PDATA_INIT(smps457, 900,  1400, NULL, 1, 1, 0);
-PALMAS_PDATA_INIT(smps8, 1050,  1050, NULL, 0, 1, 1);
+PALMAS_PDATA_INIT(smps8, 1050,  1050, NULL, 1, 1, 1);
 PALMAS_PDATA_INIT(smps9, 2800,  2800, NULL, 0, 0, 0);
 PALMAS_PDATA_INIT(smps10, 5000,  5000, NULL, 0, 0, 0);
 PALMAS_PDATA_INIT(ldo2, 2800,  2800, NULL, 0, 0, 1);
-PALMAS_PDATA_INIT(ldo3, 1200,  1200, NULL, 0, 0, 1);
+PALMAS_PDATA_INIT(ldo3, 1200,  1200, NULL, 1, 1, 1);
 PALMAS_PDATA_INIT(ldo6, 2850,  2850, NULL, 0, 0, 1);
 PALMAS_PDATA_INIT(ldo8, 900,  900, NULL, 1, 1, 1);
 PALMAS_PDATA_INIT(ldo9, 1800,  3300, NULL, 0, 0, 1);
@@ -359,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 */
@@ -434,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);
 
@@ -477,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),
@@ -693,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,
@@ -703,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,
@@ -713,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,
@@ -723,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,
@@ -733,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,
@@ -743,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,
@@ -753,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,
@@ -763,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,