From: Sandor Yu Date: Mon, 23 Sep 2013 06:20:11 +0000 (+0800) Subject: ENGR00280689-01 i.MX6 HDMI: Remove HDCP register access from driver X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=132750d15b7f9689f4446cbce91e1602932e4803;p=karo-tx-linux.git ENGR00280689-01 i.MX6 HDMI: Remove HDCP register access from driver Remove HDCP register access from HDMI driver. Signed-off-by: Sandor Yu --- diff --git a/drivers/video/mxc/mxc_hdmi.c b/drivers/video/mxc/mxc_hdmi.c index 11d6f7c882b8..ef63a97fc472 100644 --- a/drivers/video/mxc/mxc_hdmi.c +++ b/drivers/video/mxc/mxc_hdmi.c @@ -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);