davinci: Correct the GPIO number for LCD panel power

On the latest DA850/OMAP-L138 EVM (Beta) the GPIO pin
number of LCD panel power has changed. This patch takes
care of this change. Software will support only Beta
versions of DA850/OMAP-L138 EVM.

In the process, add the missing entry for data pin 0
and remove the GPIO specific pins from da850_lcdcntl_pins
structure. EVM specific muxing for LCD is being done in the
board file now.

Signed-off-by: Sudhakar Rajashekhara <sudhakar.raj@ti.com>
Signed-off-by: Kevin Hilman <khilman@deeprootsystems.com>

1 files changed, 13 insertions, 1 deletions

diff --git a/arch/arm/mach-davinci/board-da850-evm.c b/arch/arm/mach-davinci/board-da850-evm.c
index 47619a98b562..25ae0079980d 100644
--- a/arch/arm/mach-davinci/board-da850-evm.c
+++ b/arch/arm/mach-davinci/board-da850-evm.c
@@ -32,12 +32,13 @@
 #include <mach/cp_intc.h>
 #include <mach/da8xx.h>
 #include <mach/nand.h>
+#include <mach/mux.h>
 
 #define DA850_EVM_PHY_MASK              0x1
 #define DA850_EVM_MDIO_FREQUENCY        2200000 /* PHY bus frequency */
 
+#define DA850_LCD_PWR_PIN               GPIO_TO_PIN(2, 8)
 #define DA850_LCD_BL_PIN                GPIO_TO_PIN(2, 15)
-#define DA850_LCD_PWR_PIN               GPIO_TO_PIN(8, 10)
 
 #define DA850_MMCSD_CD_PIN              GPIO_TO_PIN(4, 0)
 #define DA850_MMCSD_WP_PIN              GPIO_TO_PIN(4, 1)
@@ -264,6 +265,11 @@ static void __init da850_evm_init_nor(void)
 #define HAS_MMC 0
 #endif
 
+static const short da850_evm_lcdc_pins[] = {
+        DA850_GPIO2_8, DA850_GPIO2_15,
+        -1
+};
+
 static __init void da850_evm_init(void)
 {
         struct davinci_soc_info *soc_info = &davinci_soc_info;
@@ -372,6 +378,12 @@ static __init void da850_evm_init(void)
                 pr_warning("da850_evm_init: lcdcntl mux setup failed: %d\n",
                                 ret);
 
+        /* Handle board specific muxing for LCD here */
+        ret = da8xx_pinmux_setup(da850_evm_lcdc_pins);
+        if (ret)
+                pr_warning("da850_evm_init: evm specific lcd mux setup "
+                                "failed: %d\n", ret);
+
         ret = da850_lcd_hw_init();
         if (ret)
                 pr_warning("da850_evm_init: lcd initialization failed: %d\n",