summaryrefslogtreecommitdiff
path: root/arch/arm/mach-omap2/board-omap3evm.c
diff options
context:
space:
mode:
authorVaibhav Hiremath <hvaibhav@ti.com>2011-01-25 20:37:40 +0300
committerTony Lindgren <tony@atomide.com>2011-02-18 01:18:02 +0300
commit42fc8cab020c4d848a969b7c0a80b591c35bb263 (patch)
tree63f2b772ebe570e5d867f919cc13a6524bf05ef9 /arch/arm/mach-omap2/board-omap3evm.c
parent904c545c22dc4926e73c5c869efed0ca6a778bda (diff)
downloadlinux-42fc8cab020c4d848a969b7c0a80b591c35bb263.tar.xz
OMAP3EVM: Made backlight GPIO default state to off
If you choose default output to DVI, the LCD backlight used to stay on, since panel->disable function never gets called. So, during init put backlight GPIO to off state and the driver code will decide which output to enable. Signed-off-by: Vaibhav Hiremath <hvaibhav@ti.com> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/mach-omap2/board-omap3evm.c')
-rw-r--r--arch/arm/mach-omap2/board-omap3evm.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/arch/arm/mach-omap2/board-omap3evm.c b/arch/arm/mach-omap2/board-omap3evm.c
index 36dac55b235c..4f2574c35ddf 100644
--- a/arch/arm/mach-omap2/board-omap3evm.c
+++ b/arch/arm/mach-omap2/board-omap3evm.c
@@ -456,6 +456,8 @@ static struct platform_device leds_gpio = {
static int omap3evm_twl_gpio_setup(struct device *dev,
unsigned gpio, unsigned ngpio)
{
+ int r;
+
/* gpio + 0 is "mmc0_cd" (input/IRQ) */
omap_mux_init_gpio(63, OMAP_PIN_INPUT);
mmc[0].gpio_cd = gpio + 0;
@@ -471,8 +473,12 @@ static int omap3evm_twl_gpio_setup(struct device *dev,
*/
/* TWL4030_GPIO_MAX + 0 == ledA, LCD Backlight control */
- gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
- gpio_direction_output(gpio + TWL4030_GPIO_MAX, 0);
+ r = gpio_request(gpio + TWL4030_GPIO_MAX, "EN_LCD_BKL");
+ if (!r)
+ r = gpio_direction_output(gpio + TWL4030_GPIO_MAX,
+ (get_omap3_evm_rev() >= OMAP3EVM_BOARD_GEN_2) ? 1 : 0);
+ if (r)
+ printk(KERN_ERR "failed to get/set lcd_bkl gpio\n");
/* gpio + 7 == DVI Enable */
gpio_request(gpio + 7, "EN_DVI");