it66121 hdmi: some modify to pass hdcp authentication

[firefly-linux-kernel-4.4.55.git] / drivers / video / rockchip / hdmi / chips / cat66121 / cat66121_hdmi.c

diff --git a/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c b/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c
index 891c0a56daf70aa0cd5da1a931ae39bb382a0b37..2322a8d058a7b9eaf531ea75b89192fa352835af 100755 (executable)
--- a/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c
+++ b/drivers/video/rockchip/hdmi/chips/cat66121/cat66121_hdmi.c
@@ -16,7 +16,7 @@
 #include "cat66121_hdmi.h"
 #include "cat66121_hdmi_hw.h"
 
-#define HDMI_POLL_MDELAY       100
+#define HDMI_POLL_MDELAY       50//100
 struct cat66121_hdmi_pdata *cat66121_hdmi = NULL;
 struct hdmi *hdmi=NULL;
 
@@ -213,7 +213,14 @@ static int cat66121_hdmi_i2c_probe(struct i2c_client *client,const struct i2c_de
                rc = -ENXIO;
                goto err_request_lcdc;
        }
+
+        cat66121_hdmi->plug_status = -1;
+#ifdef SUPPORT_HDCP
+       hdmi->irq = INVALID_GPIO;
+#else
        hdmi->irq = gpio_to_irq(client->irq);
+#endif
+
        hdmi->xscale = 100;
        hdmi->yscale = 100;
        hdmi->insert = cat66121_hdmi_sys_insert;
@@ -259,7 +266,7 @@ static int cat66121_hdmi_i2c_probe(struct i2c_client *client,const struct i2c_de
        }
 #endif
 
-       if(client->irq != INVALID_GPIO) {
+       if(hdmi->irq != INVALID_GPIO) {
                cat66121_irq_work_func(NULL);
                if((rc = gpio_request(client->irq, "hdmi gpio")) < 0)
                {