Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 18dbe6c5 authored by Tony Lindgren's avatar Tony Lindgren
Browse files

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: default avatarTony Lindgren <tony@atomide.com>
parent 93c43f25

arch/arm/mach-omap2/board-apollon.c

+3 −0
Original line number Original line Diff line number Diff line
@@ -332,6 +332,9 @@ static void __init omap_apollon_init(void) 
	/* REVISIT: where's the correct place */

	/* REVISIT: where's the correct place */

	omap_cfg_reg(W19_24XX_SYS_NIRQ);

	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 */

	/* Use Interal loop-back in MMC/SDIO Module Input Clock selection */

	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

	v = omap_ctrl_readl(OMAP2_CONTROL_DEVCONF0);

	v |= (1 << 24);

	v |= (1 << 24);

drivers/video/omap/lcd_apollon.c

+0 −3
Original line number Original line Diff line number Diff line
@@ -25,7 +25,6 @@ 
#include <linux/platform_device.h>

#include <linux/platform_device.h>





#include <mach/gpio.h>

#include <mach/gpio.h>

#include <plat/mux.h>





#include "omapfb.h"

#include "omapfb.h"
@@ -34,8 +33,6 @@ 
static int apollon_panel_init(struct lcd_panel *panel,

static int apollon_panel_init(struct lcd_panel *panel,

				struct omapfb_device *fbdev)

				struct omapfb_device *fbdev)

{

{

	/* configure LCD PWR_EN */

	omap_cfg_reg(M21_242X_GPIO11);

	return 0;

	return 0;

}

}