arm: tegra: dalmore/pluto: Fix backlight and pwm

Assign correct gpio to backlight enable and
internal pwm.

Bug 1017692

Change-Id: I93864612c2694c8a9fe06e01836e95c9a61cbe76
Signed-off-by: Animesh Kishore <ankishore@nvidia.com>
Reviewed-on: http://git-master/r/130139
Reviewed-by: Simone Willett <swillett@nvidia.com>
Tested-by: Simone Willett <swillett@nvidia.com>

diff --git a/arch/arm/mach-tegra/board-dalmore-panel.c b/arch/arm/mach-tegra/board-dalmore-panel.c
index 5abb806..b0e1b64 100644 (file)
--- a/arch/arm/mach-tegra/board-dalmore-panel.c
+++ b/arch/arm/mach-tegra/board-dalmore-panel.c
@@ -54,6 +54,7 @@
 
 #define DSI_PANEL_RESET                1
 #define DSI_PANEL_RST_GPIO     TEGRA_GPIO_PH3
+#define DSI_PANEL_BL_EN_GPIO   TEGRA_GPIO_PH2
 
 #define DC_CTRL_MODE   TEGRA_DC_OUT_CONTINUOUS_MODE
 
@@ -177,6 +178,8 @@ static int dalmore_dsi_panel_enable(void)
        msleep(20);
 #endif
 
+       gpio_direction_output(DSI_PANEL_BL_EN_GPIO, 1);
+
 #if PANEL_10_1_PANASONIC_1920_1200 || \
        PANEL_11_6_AUO_1920_1080 || \
        PANEL_10_1_SHARP_2560_1600
@@ -441,7 +444,7 @@ static int dalmore_disp1_check_fb(struct device *dev, struct fb_info *info)
 static struct platform_tegra_pwm_backlight_data dalmore_disp1_bl_data = {
        .which_dc               = 0,
        .which_pwm              = TEGRA_PWM_PM1,
-       .gpio_conf_to_sfio      = TEGRA_GPIO_PW1,
+       .gpio_conf_to_sfio      = TEGRA_GPIO_PH1,
        .max_brightness         = 255,
        .dft_brightness         = 224,
        .notify                 = dalmore_disp1_bl_notify,
@@ -496,6 +499,12 @@ static int dalmore_dsi_gpio_get(void)
                return err;
        }
 
+       err = gpio_request(DSI_PANEL_BL_EN_GPIO, "panel backlight");
+       if (err < 0) {
+               pr_err("panel backlight gpio request failed\n");
+               return err;
+       }
+
        return err;
 }
 

diff --git a/arch/arm/mach-tegra/board-pluto-panel.c b/arch/arm/mach-tegra/board-pluto-panel.c
index a5bd31e..b738d5b 100644 (file)
--- a/arch/arm/mach-tegra/board-pluto-panel.c
+++ b/arch/arm/mach-tegra/board-pluto-panel.c
@@ -55,6 +55,7 @@
 
 #define DSI_PANEL_RESET                1
 #define DSI_PANEL_RST_GPIO     TEGRA_GPIO_PH5
+#define DSI_PANEL_BL_EN_GPIO   TEGRA_GPIO_PH2
 
 #define DC_CTRL_MODE   TEGRA_DC_OUT_CONTINUOUS_MODE
 
@@ -260,6 +261,8 @@ static int pluto_dsi_panel_enable(void)
        msleep(20);
 #endif
 
+       gpio_direction_output(DSI_PANEL_BL_EN_GPIO, 1);
+
 #if PANEL_5_LG_720_1280
        if (avdd_lcd_2v8) {
                err = regulator_enable(avdd_lcd_2v8);
@@ -514,7 +517,7 @@ static int pluto_disp1_check_fb(struct device *dev, struct fb_info *info)
 static struct platform_tegra_pwm_backlight_data pluto_disp1_bl_data = {
        .which_dc               = 0,
        .which_pwm              = TEGRA_PWM_PM1,
-       .gpio_conf_to_sfio      = TEGRA_GPIO_PW1,
+       .gpio_conf_to_sfio      = TEGRA_GPIO_PH1,
        .max_brightness         = 255,
        .dft_brightness         = 224,
        .notify                 = pluto_disp1_bl_notify,
@@ -567,6 +570,12 @@ static int pluto_dsi_gpio_get(void)
                return err;
        }
 
+       err = gpio_request(DSI_PANEL_BL_EN_GPIO, "panel backlight");
+       if (err < 0) {
+               pr_err("panel backlight gpio request failed\n");
+               return err;
+       }
+
 #if PANEL_5_LG_720_1280
        err = gpio_request(EN_VDD_LCD_1V8, "panel regulator enable");
        if (err < 0) {