diff options
| author | Luke Huang <lhuang@nvidia.com> | 2011-07-28 15:54:29 -0700 |
|---|---|---|
| committer | Ryan Wong <ryanw@nvidia.com> | 2011-07-28 17:45:27 -0700 |
| commit | 68fd36b6fb1f73ef4a0b78f5137cea3d0b4b59b9 (patch) | |
| tree | b6ecbe671683739ec5f2a59419281ac411966617 | |
| parent | fdf4c51df7f7e721b52069fc138b856aaef88bf0 (diff) | |
Revert "ARM: tegra: enterprise: Revert Backlight Change" DO NOT MERGE
This reverts commit 8b4f1ecadcea91030dfc8522e66aaa339cf95adc.
Change-Id: I5bca62b66721dbf8079d49c71d7fbcc39f4eb75e
Reviewed-on: http://git-master/r/43810
Reviewed-by: Chih-Lung Huang <lhuang@nvidia.com>
Tested-by: Chih-Lung Huang <lhuang@nvidia.com>
Reviewed-by: Ryan Wong <ryanw@nvidia.com>
| -rw-r--r-- | arch/arm/mach-tegra/board-enterprise-panel.c | 16 |
1 files changed, 15 insertions, 1 deletions
diff --git a/arch/arm/mach-tegra/board-enterprise-panel.c b/arch/arm/mach-tegra/board-enterprise-panel.c index 4e36346208a8..a9367877dfd0 100644 --- a/arch/arm/mach-tegra/board-enterprise-panel.c +++ b/arch/arm/mach-tegra/board-enterprise-panel.c @@ -49,6 +49,7 @@ #define enterprise_hdmi_hpd TEGRA_GPIO_PN7 #define enterprise_dsi_panel_reset TEGRA_GPIO_PW0 +#define enterprise_dsi_panel_bl TEGRA_GPIO_PW1 #define enterprise_lcd_2d_3d TEGRA_GPIO_PH1 #define ENTERPRISE_STEREO_3D 0 @@ -83,7 +84,6 @@ static struct platform_device enterprise_disp1_backlight_device = { .platform_data = &enterprise_disp1_backlight_data, }, }; - static int enterprise_hdmi_vddio_enable(void) { int ret; @@ -378,11 +378,25 @@ static int enterprise_dsi_panel_enable(void) mdelay(20); #endif + ret = gpio_request(enterprise_dsi_panel_bl, "DSIa backlight"); + if (ret < 0) + return ret; + + ret = gpio_direction_output(enterprise_dsi_panel_bl, 1); + if (ret < 0) { + gpio_free(enterprise_dsi_panel_bl); + return ret; + } + tegra_gpio_enable(enterprise_dsi_panel_bl); + return ret; } static int enterprise_dsi_panel_disable(void) { + tegra_gpio_disable(enterprise_dsi_panel_bl); + gpio_free(enterprise_dsi_panel_bl); + #if DSI_PANEL_RESET tegra_gpio_disable(enterprise_dsi_panel_reset); gpio_free(enterprise_dsi_panel_reset); |