diff options
| author | Ricardo Neri <ricardo.neri@ti.com> | 2012-10-17 02:11:32 -0500 |
|---|---|---|
| committer | Andy Green <andy.green@linaro.org> | 2012-11-27 11:42:58 +0800 |
| commit | 02b0eeec3d324449d144a312611733852a1aab80 (patch) | |
| tree | 70bfda77a3f9e861ea3f792acfc7ac413467d3f7 | |
| parent | 1001a3f5fdaac3998c082929db90a5f75a50bd72 (diff) | |
OMAPDSS: Add OMAP_HDMI_DO_INIT_SIGNAL_MUX flag
In non-DT boots, we need to initialize the mux configuration for HDMI
from the board files. In DT boots, we rely on the pinmux driver and the
device tree.
The function omap_init_hdmi will be in both boot modes. Thus, we define
a flag to know whether the mux configuration should be done from the board
file or using the pinmux driver.
Signed-off-by: Ricardo Neri <ricardo.neri@ti.com>
| -rw-r--r-- | arch/arm/mach-omap2/display.c | 14 | ||||
| -rw-r--r-- | include/video/omapdss.h | 1 |
2 files changed, 9 insertions, 6 deletions
diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c index 7746e7a5741..645212d1f00 100644 --- a/arch/arm/mach-omap2/display.c +++ b/arch/arm/mach-omap2/display.c @@ -116,12 +116,14 @@ static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags) u32 reg; u16 control_i2c_1; - omap_mux_init_signal("hdmi_cec", - OMAP_PIN_INPUT_PULLUP); - omap_mux_init_signal("hdmi_ddc_scl", - OMAP_PIN_INPUT_PULLUP); - omap_mux_init_signal("hdmi_ddc_sda", - OMAP_PIN_INPUT_PULLUP); + if (flags & OMAP_HDMI_DO_INIT_SIGNAL_MUX) { + omap_mux_init_signal("hdmi_cec", + OMAP_PIN_INPUT_PULLUP); + omap_mux_init_signal("hdmi_ddc_scl", + OMAP_PIN_INPUT_PULLUP); + omap_mux_init_signal("hdmi_ddc_sda", + OMAP_PIN_INPUT_PULLUP); + } /* * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and diff --git a/include/video/omapdss.h b/include/video/omapdss.h index 418a1077d07..58f2641abd2 100644 --- a/include/video/omapdss.h +++ b/include/video/omapdss.h @@ -208,6 +208,7 @@ enum omap_dss_clk_source { enum omap_hdmi_flags { OMAP_HDMI_SDA_SCL_EXTERNAL_PULLUP = 1 << 0, + OMAP_HDMI_DO_INIT_SIGNAL_MUX = 1 << 1, }; enum omap_dss_output_id { |