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

Commit aa74274b authored by Tomi Valkeinen's avatar Tomi Valkeinen
Browse files

OMAP: 4430SDP/Panda: add HDMI HPD gpio 



Both Panda and 4430SDP use GPIO 63 as HDMI hot-plug-detect. Configure
this GPIO in the board files.

Signed-off-by: default avatarTomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: default avatarTony Lindgren <tony@atomide.com>
parent 78a1ad8f

arch/arm/mach-omap2/board-4430sdp.c

+3 −0
Original line number Diff line number Diff line
@@ -54,6 +54,7 @@ 
#define OMAP4_SFH7741_ENABLE_GPIO		188

#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */

#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */

#define HDMI_GPIO_HPD  63 /* Hotplug detect */

#define DISPLAY_SEL_GPIO	59	/* LCD2/PicoDLP switch */

#define DLP_POWER_ON_GPIO	40
@@ -598,6 +599,7 @@ static void __init omap_sfh7741prox_init(void) 
static struct gpio sdp4430_hdmi_gpios[] = {

	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH,	"hdmi_gpio_ls_oe" },

	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },

};



static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -824,6 +826,7 @@ static void omap_4430sdp_display_init(void) 


	omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);

}



#ifdef CONFIG_OMAP_MUX

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

+3 −0
Original line number Diff line number Diff line
@@ -53,6 +53,7 @@ 
#define GPIO_WIFI_IRQ		53

#define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */

#define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */

#define HDMI_GPIO_HPD  63 /* Hotplug detect */



/* wl127x BT, FM, GPS connectivity chip */

static int wl1271_gpios[] = {46, -1, -1};
@@ -481,6 +482,7 @@ int __init omap4_panda_dvi_init(void) 
static struct gpio panda_hdmi_gpios[] = {

	{ HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },

	{ HDMI_GPIO_LS_OE,	GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },

	{ HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },

};



static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
@@ -541,6 +543,7 @@ void omap4_panda_display_init(void) 


	omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);

	omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);

}



static void __init omap4_panda_init(void)