diff options
| author | Tomi Valkeinen <tomi.valkeinen@ti.com> | 2012-01-17 04:02:36 -0500 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2012-03-12 13:32:59 -0400 |
| commit | bdd91fa44646ae9e80e7a716320e9d1e7287766b (patch) | |
| tree | 9cd4bfd09d28fb5b2dd656a1b07e40fa094a73e8 /arch/arm | |
| parent | ed3984fec88b0a39f6e66ee40f124e1568f75c12 (diff) | |
OMAP: 4430SDP/Panda: setup HDMI GPIO muxes
commit 78a1ad8f12db70b8b0a4548b90704de08ee216ce upstream.
The HDMI GPIO pins LS_OE and CT_CP_HPD are not currently configured.
This patch configures them as output pins.
Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch/arm')
| -rw-r--r-- | arch/arm/mach-omap2/board-4430sdp.c | 3 | ||||
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 3 |
2 files changed, 6 insertions, 0 deletions
diff --git a/arch/arm/mach-omap2/board-4430sdp.c b/arch/arm/mach-omap2/board-4430sdp.c index 9bc418e138d..669e3293780 100644 --- a/arch/arm/mach-omap2/board-4430sdp.c +++ b/arch/arm/mach-omap2/board-4430sdp.c | |||
| @@ -631,6 +631,9 @@ void omap_4430sdp_display_init(void) | |||
| 631 | { | 631 | { |
| 632 | sdp4430_hdmi_mux_init(); | 632 | sdp4430_hdmi_mux_init(); |
| 633 | omap_display_init(&sdp4430_dss_data); | 633 | omap_display_init(&sdp4430_dss_data); |
| 634 | |||
| 635 | omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT); | ||
| 636 | omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT); | ||
| 634 | } | 637 | } |
| 635 | 638 | ||
| 636 | #ifdef CONFIG_OMAP_MUX | 639 | #ifdef CONFIG_OMAP_MUX |
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index 86a2d30a9fc..5d519fb01a8 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c | |||
| @@ -674,6 +674,9 @@ void omap4_panda_display_init(void) | |||
| 674 | 674 | ||
| 675 | omap4_panda_hdmi_mux_init(); | 675 | omap4_panda_hdmi_mux_init(); |
| 676 | omap_display_init(&omap4_panda_dss_data); | 676 | omap_display_init(&omap4_panda_dss_data); |
| 677 | |||
| 678 | omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT); | ||
| 679 | omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT); | ||
| 677 | } | 680 | } |
| 678 | 681 | ||
| 679 | static void __init omap4_panda_init(void) | 682 | static void __init omap4_panda_init(void) |
