OMAPDSS: split hdmi muxing function

Split the omap4_hdmi_mux_pads() function into two parts, one handles the
tpd12s015 gpio muxing, the other handles the hdmi pins.

This is clearer, as hdmi and tpd12s015 are separate devices, and it also
allows us to mux those separately with DT.

Signed-off-by: Tomi Valkeinen <tomi.valkeinen@ti.com>
Cc: Ricardo Neri <ricardo.neri@ti.com>
Acked-by: Tony Lindgren <tony@atomide.com>

1 files changed, 10 insertions, 5 deletions

diff --git a/arch/arm/mach-omap2/display.c b/arch/arm/mach-omap2/display.c
index 28f508724a56..282c814ea2e2 100644
--- a/arch/arm/mach-omap2/display.c
+++ b/arch/arm/mach-omap2/display.c
@@ -100,17 +100,20 @@ static const struct omap_dss_hwmod_data omap4_dss_hwmod_data[] __initconst = {
         { "dss_hdmi", "omapdss_hdmi", -1 },
 };
 
-static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)
+static void __init omap4_tpd12s015_mux_pads(void)
 {
-        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);
+}
+
+static void __init omap4_hdmi_mux_pads(enum omap_hdmi_flags flags)
+{
+        u32 reg;
+        u16 control_i2c_1;
 
         /*
          * CONTROL_I2C_1: HDMI_DDC_SDA_PULLUPRESX (bit 28) and
@@ -161,8 +164,10 @@ static int omap4_dsi_mux_pads(int dsi_id, unsigned lanes)
 
 int __init omap_hdmi_init(enum omap_hdmi_flags flags)
 {
-        if (cpu_is_omap44xx())
+        if (cpu_is_omap44xx()) {
                 omap4_hdmi_mux_pads(flags);
+                omap4_tpd12s015_mux_pads();
+        }
 
         return 0;
 }