Merge tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6

fbdev fixes for 3.3

It includes:
 - compile fix for fsl-diu-fb
 - fix for a suspend/resume issue in atmel_lcdfb
 - fix for a suspend/resume issue in OMAP
 - workaround for a hardware bug to avoid physical damage in OMAP
 - really trivial dead code removal in intelfb

* tag 'fbdev-fixes-for-3.3-1' of git://github.com/schandinat/linux-2.6:
  atmel_lcdfb: fix usage of CONTRAST_CTR in suspend/resume
  intelfb: remove some dead code
  drivers/video: compile fixes for fsl-diu-fb.c
  OMAPDSS: HDMI: PHY burnout fix
  OMAP: 4430SDP/Panda: add HDMI HPD gpio
  OMAP: 4430SDP/Panda: setup HDMI GPIO muxes
  OMAPDSS: remove wrong HDMI HPD muxing
  OMAP: 4430SDP/Panda: rename HPD GPIO to CT_CP_HPD
  OMAP: 4430SDP/Panda: use gpio_free_array to free HDMI gpios
  OMAPDSS: use sync versions of pm_runtime_put

11 files changed, 80 insertions, 14 deletions

diff --git a/drivers/video/atmel_lcdfb.c b/drivers/video/atmel_lcdfb.c
index 0d7b20d4285d..e40c00f2c2ba 100644
--- a/drivers/video/atmel_lcdfb.c
+++ b/drivers/video/atmel_lcdfb.c
@@ -1108,7 +1108,7 @@ static int atmel_lcdfb_suspend(struct platform_device *pdev, pm_message_t mesg)
          */
         lcdc_writel(sinfo, ATMEL_LCDC_IDR, ~0UL);
 
-        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_VAL);
+        sinfo->saved_lcdcon = lcdc_readl(sinfo, ATMEL_LCDC_CONTRAST_CTR);
         lcdc_writel(sinfo, ATMEL_LCDC_CONTRAST_CTR, 0);
         if (sinfo->atmel_lcdfb_power_control)
                 sinfo->atmel_lcdfb_power_control(0);
diff --git a/drivers/video/fsl-diu-fb.c b/drivers/video/fsl-diu-fb.c
index acf292bfba02..6af3f16754f0 100644
--- a/drivers/video/fsl-diu-fb.c
+++ b/drivers/video/fsl-diu-fb.c
@@ -1432,7 +1432,7 @@ static int fsl_diu_suspend(struct platform_device *ofdev, pm_message_t state)
         struct fsl_diu_data *data;
 
         data = dev_get_drvdata(&ofdev->dev);
-        disable_lcdc(data->fsl_diu_info[0]);
+        disable_lcdc(data->fsl_diu_info);
 
         return 0;
 }
@@ -1442,7 +1442,7 @@ static int fsl_diu_resume(struct platform_device *ofdev)
         struct fsl_diu_data *data;
 
         data = dev_get_drvdata(&ofdev->dev);
-        enable_lcdc(data->fsl_diu_info[0]);
+        enable_lcdc(data->fsl_diu_info);
 
         return 0;
 }
diff --git a/drivers/video/intelfb/intelfbdrv.c b/drivers/video/intelfb/intelfbdrv.c
index c6afa33a4532..02fd2263610c 100644
--- a/drivers/video/intelfb/intelfbdrv.c
+++ b/drivers/video/intelfb/intelfbdrv.c
@@ -529,7 +529,6 @@ static int __devinit intelfb_pci_register(struct pci_dev *pdev,
         if (fb_alloc_cmap(&info->cmap, 256, 1) < 0) {
                 ERR_MSG("Could not allocate cmap for intelfb_info.\n");
                 goto err_out_cmap;
-                return -ENODEV;
         }
 
         dinfo = info->par;
diff --git a/drivers/video/omap2/dss/dispc.c b/drivers/video/omap2/dss/dispc.c
index a5ec7f37c185..e1626a1d5c45 100644
--- a/drivers/video/omap2/dss/dispc.c
+++ b/drivers/video/omap2/dss/dispc.c
@@ -401,7 +401,7 @@ void dispc_runtime_put(void)
 
         DSSDBG("dispc_runtime_put\n");
 
-        r = pm_runtime_put(&dispc.pdev->dev);
+        r = pm_runtime_put_sync(&dispc.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/dsi.c b/drivers/video/omap2/dss/dsi.c
index d4d676c82c12..52f36ec1c8bb 100644
--- a/drivers/video/omap2/dss/dsi.c
+++ b/drivers/video/omap2/dss/dsi.c
@@ -1079,7 +1079,7 @@ void dsi_runtime_put(struct platform_device *dsidev)
 
         DSSDBG("dsi_runtime_put\n");
 
-        r = pm_runtime_put(&dsi->pdev->dev);
+        r = pm_runtime_put_sync(&dsi->pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/dss.c b/drivers/video/omap2/dss/dss.c
index 17033457ee89..77c2b5a32b5d 100644
--- a/drivers/video/omap2/dss/dss.c
+++ b/drivers/video/omap2/dss/dss.c
@@ -720,7 +720,7 @@ void dss_runtime_put(void)
 
         DSSDBG("dss_runtime_put\n");
 
-        r = pm_runtime_put(&dss.pdev->dev);
+        r = pm_runtime_put_sync(&dss.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/hdmi.c b/drivers/video/omap2/dss/hdmi.c
index b4c270edb915..d7aa3b056529 100644
--- a/drivers/video/omap2/dss/hdmi.c
+++ b/drivers/video/omap2/dss/hdmi.c
@@ -176,7 +176,7 @@ static void hdmi_runtime_put(void)
 
         DSSDBG("hdmi_runtime_put\n");
 
-        r = pm_runtime_put(&hdmi.pdev->dev);
+        r = pm_runtime_put_sync(&hdmi.pdev->dev);
         WARN_ON(r < 0);
 }
 
@@ -497,6 +497,7 @@ bool omapdss_hdmi_detect(void)
 
 int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
 {
+        struct omap_dss_hdmi_data *priv = dssdev->data;
         int r = 0;
 
         DSSDBG("ENTER hdmi_display_enable\n");
@@ -509,6 +510,8 @@ int omapdss_hdmi_display_enable(struct omap_dss_device *dssdev)
                 goto err0;
         }
 
+        hdmi.ip_data.hpd_gpio = priv->hpd_gpio;
+
         r = omap_dss_start_device(dssdev);
         if (r) {
                 DSSERR("failed to start device\n");
diff --git a/drivers/video/omap2/dss/rfbi.c b/drivers/video/omap2/dss/rfbi.c
index 814bb9500dca..55f398014f33 100644
--- a/drivers/video/omap2/dss/rfbi.c
+++ b/drivers/video/omap2/dss/rfbi.c
@@ -140,7 +140,7 @@ static void rfbi_runtime_put(void)
 
         DSSDBG("rfbi_runtime_put\n");
 
-        r = pm_runtime_put(&rfbi.pdev->dev);
+        r = pm_runtime_put_sync(&rfbi.pdev->dev);
         WARN_ON(r < 0);
 }
 
diff --git a/drivers/video/omap2/dss/ti_hdmi.h b/drivers/video/omap2/dss/ti_hdmi.h
index 7503f7f619a7..50dadba5070a 100644
--- a/drivers/video/omap2/dss/ti_hdmi.h
+++ b/drivers/video/omap2/dss/ti_hdmi.h
@@ -126,6 +126,10 @@ struct hdmi_ip_data {
         const struct ti_hdmi_ip_ops *ops;
         struct hdmi_config cfg;
         struct hdmi_pll_info pll_data;
+
+        /* ti_hdmi_4xxx_ip private data. These should be in a separate struct */
+        int hpd_gpio;
+        bool phy_tx_enabled;
 };
 int ti_hdmi_4xxx_phy_enable(struct hdmi_ip_data *ip_data);
 void ti_hdmi_4xxx_phy_disable(struct hdmi_ip_data *ip_data);
diff --git a/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c b/drivers/video/omap2/dss/ti_hdmi_4xxx_ip.c
index 9af81f18f163..2d72334ca3da 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)
diff --git a/drivers/video/omap2/dss/venc.c b/drivers/video/omap2/dss/venc.c
index b3e9f9091581..5c3d0f901510 100644
--- a/drivers/video/omap2/dss/venc.c
+++ b/drivers/video/omap2/dss/venc.c
@@ -401,7 +401,7 @@ static void venc_runtime_put(void)
 
         DSSDBG("venc_runtime_put\n");
 
-        r = pm_runtime_put(&venc.pdev->dev);
+        r = pm_runtime_put_sync(&venc.pdev->dev);
         WARN_ON(r < 0);
 }