]> git.karo-electronics.de Git - karo-tx-linux.git/commitdiff
ENGR00280689-01 i.MX6 HDMI: Remove HDCP register access from driver
authorSandor Yu <R01008@freescale.com>
Mon, 23 Sep 2013 06:20:11 +0000 (14:20 +0800)
committerJason Liu <r64343@freescale.com>
Wed, 30 Oct 2013 01:55:47 +0000 (09:55 +0800)
Remove HDCP register access from HDMI driver.

Signed-off-by: Sandor Yu <R01008@freescale.com>
drivers/video/mxc/mxc_hdmi.c

index 11d6f7c882b8a1801499debb80456423c789719a..ef63a97fc47284d49ef8497645f9b9990a32ebb1 100644 (file)
@@ -1451,11 +1451,7 @@ static void hdmi_av_composer(struct mxc_hdmi *hdmi)
        dev_dbg(&hdmi->pdev->dev, "final pixclk = %d\n", vmode->mPixelClock);
 
        /* Set up HDMI_FC_INVIDCONF */
-       inv_val = (hdmi->hdmi_data.hdcp_enable ?
-               HDMI_FC_INVIDCONF_HDCP_KEEPOUT_ACTIVE :
-               HDMI_FC_INVIDCONF_HDCP_KEEPOUT_INACTIVE);
-
-       inv_val |= (vmode->mVSyncPolarity ?
+       inv_val = (vmode->mVSyncPolarity ?
                HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_HIGH :
                HDMI_FC_INVIDCONF_VSYNC_IN_POLARITY_ACTIVE_LOW);