[glsdk/meta-ti-glsdk.git] / recipes-kernel / linux / linux-ti33x-psp-3.2 / 3.2.10 / 0062-OMAP-4430SDP-Panda-add-HDMI-HPD-gpio.patch
1 From 493540069d02cdf71f7d7567c9ccca6000aefbed Mon Sep 17 00:00:00 2001
2 From: Tomi Valkeinen <tomi.valkeinen@ti.com>
3 Date: Tue, 17 Jan 2012 11:05:32 +0200
4 Subject: [PATCH 62/95] OMAP: 4430SDP/Panda: add HDMI HPD gpio
6 commit aa74274b464d4aa24703963ac89a0ee942d5d267 upstream.
8 Both Panda and 4430SDP use GPIO 63 as HDMI hot-plug-detect. Configure
9 this GPIO in the board files.
11 Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
12 Acked-by: Tony Lindgren <tony@atomide.com>
13 Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
14 ---
15 arch/arm/mach-omap2/board-4430sdp.c | 3 +++
16 arch/arm/mach-omap2/board-omap4panda.c | 3 +++
17 2 files changed, 6 insertions(+)
19 diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c
20 index 580d436..2809855 100644
21 --- a/arch/arm/mach-omap2/board-4430sdp.c
22 +++ b/arch/arm/mach-omap2/board-4430sdp.c
23 @@ -54,6 +54,7 @@
24 #define OMAP4_SFH7741_ENABLE_GPIO 188
25 #define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
26 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
27 +#define HDMI_GPIO_HPD 63 /* Hotplug detect */
28 #define DISPLAY_SEL_GPIO 59 /* LCD2/PicoDLP switch */
29 #define DLP_POWER_ON_GPIO 40
31 @@ -615,6 +616,7 @@ static void sdp4430_hdmi_mux_init(void)
32 static struct gpio sdp4430_hdmi_gpios[] = {
33 { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
34 { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
35 + { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
36 };
38 static int sdp4430_panel_enable_hdmi(struct omap_dss_device *dssdev)
39 @@ -834,6 +836,7 @@ static void omap_4430sdp_display_init(void)
41 omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
42 omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
43 + omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
44 }
46 #ifdef CONFIG_OMAP_MUX
47 diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
48 index d32ba6f..bdc0a47 100644
49 --- a/arch/arm/mach-omap2/board-omap4panda.c
50 +++ b/arch/arm/mach-omap2/board-omap4panda.c
51 @@ -53,6 +53,7 @@
52 #define GPIO_WIFI_IRQ 53
53 #define HDMI_GPIO_CT_CP_HPD 60 /* HPD mode enable/disable */
54 #define HDMI_GPIO_LS_OE 41 /* Level shifter for HDMI */
55 +#define HDMI_GPIO_HPD 63 /* Hotplug detect */
57 /* wl127x BT, FM, GPS connectivity chip */
58 static int wl1271_gpios[] = {46, -1, -1};
59 @@ -426,6 +427,7 @@ static void omap4_panda_hdmi_mux_init(void)
60 static struct gpio panda_hdmi_gpios[] = {
61 { HDMI_GPIO_CT_CP_HPD, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ct_cp_hpd" },
62 { HDMI_GPIO_LS_OE, GPIOF_OUT_INIT_HIGH, "hdmi_gpio_ls_oe" },
63 + { HDMI_GPIO_HPD, GPIOF_DIR_IN, "hdmi_gpio_hpd" },
64 };
66 static int omap4_panda_panel_enable_hdmi(struct omap_dss_device *dssdev)
67 @@ -478,6 +480,7 @@ void omap4_panda_display_init(void)
69 omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT);
70 omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT);
71 + omap_mux_init_gpio(HDMI_GPIO_HPD, OMAP_PIN_INPUT_PULLDOWN);
72 }
74 static void __init omap4_panda_init(void)
75 --
76 1.7.9.4