ARM: Tegra: Roth: Fix Display
Matt Wagner [Fri, 16 Nov 2012 22:10:39 +0000 (14:10 -0800)]
Fix 5" Display Regulators and GPIOs on Roth

Reviewed-on: http://git-master/r/164428
(cherry picked from commit c83b2e055e8857c1ccd1a169adf250b3798375e6)
Change-Id: I2cf10b1a6ae3c432c9cb2ef6724b3341a192de3f
Signed-off-by: Matt Wagner <mwagner@nvidia.com>
Signed-off-by: Vikram Kanigiri <vkanigiri@nvidia.com>
Reviewed-on: http://git-master/r/164902
Reviewed-by: Rohan Somvanshi <rsomvanshi@nvidia.com>
Tested-by: Rohan Somvanshi <rsomvanshi@nvidia.com>

arch/arm/mach-tegra/board-roth-panel.c
arch/arm/mach-tegra/board-roth-power.c

index b684a80..9ed91ae 100644 (file)
@@ -58,7 +58,6 @@ struct platform_device * __init roth_host1x_init(void)
 #define DSI_PANEL_RESET                1
 
 #define DSI_PANEL_RST_GPIO     TEGRA_GPIO_PH3
-#define DSI_PANEL_BL_EN_GPIO   TEGRA_GPIO_PH2
 #define DSI_PANEL_BL_PWM       TEGRA_GPIO_PH1
 
 #define DC_CTRL_MODE   TEGRA_DC_OUT_CONTINUOUS_MODE
@@ -301,12 +300,6 @@ static int roth_dsi_gpio_get(void)
                goto fail;
        }
 
-       err = gpio_request(DSI_PANEL_BL_EN_GPIO, "panel backlight");
-       if (err < 0) {
-               pr_err("panel backlight gpio request failed\n");
-               goto fail;
-       }
-
        gpio_requested = true;
        return 0;
 fail:
@@ -364,8 +357,6 @@ static int roth_dsi_panel_enable(struct device *dev)
        msleep(20);
 #endif
 
-       gpio_direction_output(DSI_PANEL_BL_EN_GPIO, 1);
-
        return 0;
 fail:
        return err;
@@ -373,8 +364,6 @@ fail:
 
 static int roth_dsi_panel_disable(void)
 {
-       gpio_set_value(DSI_PANEL_BL_EN_GPIO, 0);
-
        if (vdd_sys_bl_3v7)
                regulator_disable(vdd_sys_bl_3v7);
 
index 2dd0c07..37bef65 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),
 };