diff options
| author | Ricardo Neri <ricardo.neri@ti.com> | 2012-10-17 01:19:11 -0500 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-11-27 11:42:59 +0800 |
| commit | 2c474c355994aa73cc33d5d1bc27705ef5decd8a (patch) | |
| tree | 51dad07b831cde043bd243d23aeac09141ed7df7 | |
| parent | b3a277cbd6e2d057baf1ef7fe1e6cafb8381f375 (diff) | |
ARM: OMAP4: board-omap4panda: Set flag to init mux signals for HDMI
If we are are booting using this board file, we should specify
that the mux signal initialization should be performed.
Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/board-omap4panda.c | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c index a1fdebebd2b..761f2105d09 100644 --- a/arch/arm/mach-omap2/board-omap4panda.c +++ b/arch/arm/mach-omap2/board-omap4panda.c @@ -468,6 +468,10 @@ static struct omap_dss_board_info omap4_panda_dss_data = { static void __init omap4_panda_display_init(void) { + enum omap_hdmi_flags flags; + + /* in non-DT boot HDMI signal muxing is needed */ + flags = OMAP_HDMI_DO_INIT_SIGNAL_MUX; omap_display_init(&omap4_panda_dss_data); @@ -476,9 +480,9 @@ static void __init omap4_panda_display_init(void) * later have external pull up on the HDMI I2C lines */ if (cpu_is_omap446x() || omap_rev() > OMAP4430_REV_ES2_2) - omap_hdmi_init(OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP); - else - omap_hdmi_init(0); + flags |= OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP; + + omap_hdmi_init(flags); omap_mux_init_gpio(HDMI_GPIO_LS_OE, OMAP_PIN_OUTPUT); omap_mux_init_gpio(HDMI_GPIO_CT_CP_HPD, OMAP_PIN_OUTPUT); |