mfd:rk616:hdmi:use threaded irq,hot pulg ok

diff --git a/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c b/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
index b901a22bf3b79f5d2e1eb07ad100003f54a8d545..7bed90d0d546e1e742b454d3493718a46483aadb 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
+++ b/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi.c
@@ -225,7 +225,7 @@ static int __devinit rk616_hdmi_probe (struct platform_device *pdev)
                }
 
                /* request the IRQ */
-               ret = request_irq(hdmi->irq, hdmi_irq,IRQF_TRIGGER_FALLING,dev_name(&pdev->dev), hdmi);
+               ret = request_threaded_irq(hdmi->irq,NULL,hdmi_irq,IRQF_TRIGGER_FALLING,dev_name(&pdev->dev), hdmi);
                if (ret)
                {
                        dev_err(hdmi->dev, "hdmi request_irq failed (%d).\n", ret);

diff --git a/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
index ab2d2031d798e4633dfd0bd3de3dbb0dab4c59ea..3fce867906da75464408af1119750bd72651b709 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
+++ b/drivers/video/rockchip/hdmi/chips/rk616/rk616_hdmi_hw.c
@@ -422,14 +422,12 @@ int rk616_hdmi_removed(void)
 
 irqreturn_t hdmi_irq(int irq, void *priv)
 {              
-       char interrupt1 = 0;
+       u32 interrupt1 = 0;
        unsigned long flags;
        spin_lock_irqsave(&hdmi->irq_lock,flags);
        HDMIRdReg(INTERRUPT_STATUS1,&interrupt1);
        HDMIWrReg(INTERRUPT_STATUS1, interrupt1);
-#if 1
-       hdmi_dbg(hdmi->dev,"[%s] interrupt1 %02x\n",__func__, interrupt1);
-#endif
+
        if(interrupt1 & m_INT_HOTPLUG ){
                if(hdmi->state == HDMI_SLEEP)
                        hdmi->state = WAIT_HOTPLUG;
@@ -447,6 +445,7 @@ irqreturn_t hdmi_irq(int irq, void *priv)
                hdmi->hdcp_irq_cb(interrupt2);
 #endif
        spin_unlock_irqrestore(&hdmi->irq_lock,flags);
+       printk("int statu1:0x%08x\n",interrupt1);
        return IRQ_HANDLED;
 }
 
@@ -460,7 +459,7 @@ static void rk616_hdmi_reset(void)
        HDMIMskReg(SYS_CTRL,m_RST_ANALOG,v_NOT_RST_ANALOG);             
        delay100us();
        msk = m_REG_CLK_INV | m_VCLK_INV | m_REG_CLK_SOURCE | m_POWER | m_INT_POL;
-       val = v_REG_CLK_INV| v_VCLK_INV | v_REG_CLK_SOURCE_SYS | v_PWR_ON |v_INT_POL_LOW;
+       val = v_REG_CLK_INV| v_VCLK_INV | v_REG_CLK_SOURCE_SYS | v_PWR_ON |v_INT_POL_HIGH;
        HDMIMskReg(SYS_CTRL,msk,val);
        rk616_hdmi_set_pwr_mode(LOWER_PWR);
 }