summaryrefslogtreecommitdiff
path: root/arch
diff options
context:
space:
mode:
authorTomi Valkeinen <tomi.valkeinen@ti.com>2012-01-17 10:59:00 +0200
committerTomi Valkeinen <tomi.valkeinen@ti.com>2012-01-26 13:51:34 +0200
commit7bb122d155f742fe2d79849090c825be7b4a247e (patch)
tree5efb3b511ab0cab2892d9aa0a6213ac87618d4da /arch
parent3932a32fcf5393f8be70ac99dc718ad7ad0a415b (diff)
downloadlinux-3.10-7bb122d155f742fe2d79849090c825be7b4a247e.tar.gz
linux-3.10-7bb122d155f742fe2d79849090c825be7b4a247e.tar.bz2
linux-3.10-7bb122d155f742fe2d79849090c825be7b4a247e.zip
OMAPDSS: remove wrong HDMI HPD muxing
"hdmi_hpd" pin is muxed to INPUT and PULLUP, but the pin is not currently used, and in the future when it is used, the pin is used as a GPIO and is board specific, not an OMAP4 wide thing. So remove the muxing for now. Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com> Acked-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/mach-omap2/display.c4
1 files changed, 0 insertions, 4 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index ffd9bd98302..d6e65e29d83 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -102,12 +102,8 @@ static void omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)
u32 reg;
u16 control_i2c_1;
- /* PAD0_HDMI_HPD_PAD1_HDMI_CEC */
- omap_mux_init_signal("hdmi_hpd",
- OMAP_PIN_INPUT_PULLUP);
omap_mux_init_signal("hdmi_cec",
OMAP_PIN_INPUT_PULLUP);
- /* PAD0_HDMI_DDC_SCL_PAD1_HDMI_DDC_SDA */
omap_mux_init_signal("hdmi_ddc_scl",
OMAP_PIN_INPUT_PULLUP);
omap_mux_init_signal("hdmi_ddc_sda",