OMAP4460: HDMI: Disable HDMI DDC internal pull up resistor

Disables the internal pull resistor for SDA and SCL enabled by
default as there are expernal pull up's to avoid the EDID read failure.

Patch done mainly by Mythri P K <mythripk@ti.com>

Signed-off-by: Ricardo Salveti de Araujo <ricardo.salveti@linaro.org>

1 files changed, 21 insertions, 0 deletions

diff --git a/arch/arm/mach-omap2/board-omap4panda.c b/arch/arm/mach-omap2/board-omap4panda.c
index 097b0d3a354..ecb59588e47 100644
--- a/arch/arm/mach-omap2/board-omap4panda.c
+++ b/arch/arm/mach-omap2/board-omap4panda.c
@@ -565,12 +565,33 @@ int __init omap4_panda_dvi_init(void)
 
 static void omap4_panda_hdmi_mux_init(void)
 {
+        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);
         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
+         * HDMI_DDC_SCL_PULLUPRESX (bit 24) are set to disable
+         * internal pull up resistor - This is a change needed in
+         * OMAP4460 and OMAP4430 ES2.3 as the external pull up
+         * are present. This is needed to avoid EDID read failure.
+         */
+        if (cpu_is_omap446x() || (omap_rev() > OMAP4430_REV_ES2_2)) {
+                control_i2c_1 = OMAP4_CTRL_MODULE_PAD_CORE_CONTROL_I2C_1;
+                reg = omap4_ctrl_pad_readl(control_i2c_1);
+                reg |= (OMAP4_HDMI_DDC_SDA_PULLUPRESX_MASK |
+                                OMAP4_HDMI_DDC_SCL_PULLUPRESX_MASK);
+                omap4_ctrl_pad_writel(reg, control_i2c_1);
+        }
 }
 
 static struct gpio panda_hdmi_gpios[] = {