omap: mux: Mux Apollon LCD power in board-apollon.c

Use the new mux function for that.

Cc: Kyungmin Park <kyungmin.park@samsung.com>
Cc: Tomi Valkeinen <tomi.valkeinen@nokia.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

2 files changed, 3 insertions, 3 deletions

diff --git a/arch/arm/mach-omap2/board-apollon.c b/arch/arm/mach-omap2/board-apollon.c
index b86a8790dd98..bc67026088f6 100644
--- a/arch/arm/mach-omap2/board-apollon.c
+++ b/arch/arm/mach-omap2/board-apollon.c
@@ -332,6 +332,9 @@ static void __init omap_apollon_init(void)
         /* REVISIT: where's the correct place */
         omap_cfg_reg(W19_24XX_SYS_NIRQ);
 
+        /* LCD PWR_EN */
+        omap_mux_init_signal("mcbsp2_dr.gpio_11", OMAP_PULL_ENA | OMAP_PULL_UP);
+
         /* Use Interal loop-back in MMC/SDIO Module Input Clock selection */
         v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);
         v |= (1 << 24);
diff --git a/drivers/video/omap/lcd_apollon.c b/drivers/video/omap/lcd_apollon.c
index 2be94eb3bbf5..10459d8bd9a0 100644
--- a/drivers/video/omap/lcd_apollon.c
+++ b/drivers/video/omap/lcd_apollon.c
@@ -25,7 +25,6 @@
 #include <linux/platform_device.h>
 
 #include <mach/gpio.h>
-#include <plat/mux.h>
 
 #include "omapfb.h"
 
@@ -34,8 +33,6 @@
 static int apollon_panel_init(struct lcd_panel *panel,
                                 struct omapfb_device *fbdev)
 {
-        /* configure LCD PWR_EN */
-        omap_cfg_reg(M21_242X_GPIO11);
         return 0;
 }