1 files changed, 14 insertions, 10 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 62b98bffc15..07de8db1458 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -339,6 +339,15 @@ static struct davinci_mmc_config da850_mmc_config = {
         .version        = MMC_CTLR_VERSION_2,
 };
 
+static void da850_panel_power_ctrl(int val)
+{
+        /* lcd backlight */
+        gpio_set_value(DA850_LCD_BL_PIN, val);
+
+        /* lcd power */
+        gpio_set_value(DA850_LCD_PWR_PIN, val);
+}
+
 static int da850_lcd_hw_init(void)
 {
         int status;
@@ -356,17 +365,11 @@ static int da850_lcd_hw_init(void)
         gpio_direction_output(DA850_LCD_BL_PIN, 0);
         gpio_direction_output(DA850_LCD_PWR_PIN, 0);
 
-        /* disable lcd backlight */
-        gpio_set_value(DA850_LCD_BL_PIN, 0);
-
-        /* disable lcd power */
-        gpio_set_value(DA850_LCD_PWR_PIN, 0);
-
-        /* enable lcd power */
-        gpio_set_value(DA850_LCD_PWR_PIN, 1);
+        /* Switch off panel power and backlight */
+        da850_panel_power_ctrl(0);
 
-        /* enable lcd backlight */
-        gpio_set_value(DA850_LCD_BL_PIN, 1);
+        /* Switch on panel power and backlight */
+        da850_panel_power_ctrl(1);
 
         return 0;
 }
@@ -674,6 +677,7 @@ static __init void da850_evm_init(void)
                 pr_warning("da850_evm_init: lcd initialization failed: %d\n",
                                 ret);
 
+        sharp_lk043t1dg01_pdata.panel_power_ctrl = da850_panel_power_ctrl,
         ret = da8xx_register_lcdc(&sharp_lk043t1dg01_pdata);
         if (ret)
                 pr_warning("da850_evm_init: lcdc registration failed: %d\n",