1 files changed, 65 insertions, 12 deletions

diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index 9af81f18f163..6847a478b459 100644
--- a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
+++ b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
@@ -28,6 +28,7 @@
 #include <linux/delay.h>
 #include <linux/string.h>
 #include <linux/seq_file.h>
+#include <linux/gpio.h>
 
 #include "ti_hdmi_4xxx_ip.h"
 #include "dss.h"
@@ -223,6 +224,49 @@ void ti_hdmi_4xxx_pll_disable(struct hdmi_ip_data *ip_data)
         hdmi_set_pll_pwr(ip_data, HDMI_PLLPWRCMD_ALLOFF);
 }
 
+static int hdmi_check_hpd_state(struct hdmi_ip_data *ip_data)
+{
+        unsigned long flags;
+        bool hpd;
+        int r;
+        /* this should be in ti_hdmi_4xxx_ip private data */
+        static DEFINE_SPINLOCK(phy_tx_lock);
+
+        spin_lock_irqsave(&phy_tx_lock, flags);
+
+        hpd = gpio_get_value(ip_data->hpd_gpio);
+
+        if (hpd == ip_data->phy_tx_enabled) {
+                spin_unlock_irqrestore(&phy_tx_lock, flags);
+                return 0;
+        }
+
+        if (hpd)
+                r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_TXON);
+        else
+                r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_LDOON);
+
+        if (r) {
+                DSSERR("Failed to %s PHY TX power\n",
+                                hpd ? "enable" : "disable");
+                goto err;
+        }
+
+        ip_data->phy_tx_enabled = hpd;
+err:
+        spin_unlock_irqrestore(&phy_tx_lock, flags);
+        return r;
+}
+
+static irqreturn_t hpd_irq_handler(int irq, void *data)
+{
+        struct hdmi_ip_data *ip_data = data;
+
+        hdmi_check_hpd_state(ip_data);
+
+        return IRQ_HANDLED;
+}
+
 int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
 {
         u16 r = 0;
@@ -232,10 +276,6 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
         if (r)
                 return r;
 
-        r = hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_TXON);
-        if (r)
-                return r;
-
         /*
          * Read address 0 in order to get the SCP reset done completed
          * Dummy access performed to make sure reset is done
@@ -257,12 +297,32 @@ int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data)
         /* Write to phy address 3 to change the polarity control */
         REG_FLD_MOD(phy_base, HDMI_TXPHY_PAD_CFG_CTRL, 0x1, 27, 27);
 
+        r = request_threaded_irq(gpio_to_irq(ip_data->hpd_gpio),
+                        NULL, hpd_irq_handler,
+                        IRQF_DISABLED | IRQF_TRIGGER_RISING |
+                        IRQF_TRIGGER_FALLING, "hpd", ip_data);
+        if (r) {
+                DSSERR("HPD IRQ request failed\n");
+                hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+                return r;
+        }
+
+        r = hdmi_check_hpd_state(ip_data);
+        if (r) {
+                free_irq(gpio_to_irq(ip_data->hpd_gpio), ip_data);
+                hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+                return r;
+        }
+
         return 0;
 }
 
 void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data)
 {
+        free_irq(gpio_to_irq(ip_data->hpd_gpio), ip_data);
+
         hdmi_set_phy_pwr(ip_data, HDMI_PHYPWRCMD_OFF);
+        ip_data->phy_tx_enabled = false;
 }
 
 static int hdmi_core_ddc_init(struct hdmi_ip_data *ip_data)
@@ -419,14 +479,7 @@ int ti_hdmi_4xxx_read_edid(struct hdmi_ip_data *ip_data,
 
 bool ti_hdmi_4xxx_detect(struct hdmi_ip_data *ip_data)
 {
-        int r;
-
-        void __iomem *base = hdmi_core_sys_base(ip_data);
-
-        /* HPD */
-        r = REG_GET(base, HDMI_CORE_SYS_SYS_STAT, 1, 1);
-
-        return r == 1;
+        return gpio_get_value(ip_data->hpd_gpio);
 }
 
 static void hdmi_core_init(struct hdmi_core_video_config *video_cfg,