MLK-16565: hdmi: Remove CEC clock setting in HDMI driver

HDMI CEC clock have management in HDMI CEC driver,
so bypass CEC clock in HDMI driver.

Signed-off-by: Sandor Yu <Sandor.yu@nxp.com>

diff --git a/drivers/video/fbdev/mxc/mxc_hdmi.c b/drivers/video/fbdev/mxc/mxc_hdmi.c
index ebec8d2..9e84480 100644 (file)
--- a/drivers/video/fbdev/mxc/mxc_hdmi.c
+++ b/drivers/video/fbdev/mxc/mxc_hdmi.c
@@ -1694,8 +1694,8 @@ static void mxc_hdmi_enable_video_path(struct mxc_hdmi *hdmi)
        hdmi_writeb(0x16, HDMI_FC_CH1PREAM);
        hdmi_writeb(0x21, HDMI_FC_CH2PREAM);
 
+       clkdis = hdmi_readb(HDMI_MC_CLKDIS);
        /* Enable pixel clock and tmds data path */
-       clkdis = 0x7F;
        clkdis &= ~HDMI_MC_CLKDIS_PIXELCLK_DISABLE;
        hdmi_writeb(clkdis, HDMI_MC_CLKDIS);
 
@@ -1986,10 +1986,13 @@ static void mxc_hdmi_power_off(struct mxc_dispdrv_handle *disp,
 
 static void mxc_hdmi_cable_disconnected(struct mxc_hdmi *hdmi)
 {
-       dev_dbg(&hdmi->pdev->dev, "%s\n", __func__);
+       u8 clkdis;
 
-       /* Disable All HDMI clock */
-       hdmi_writeb(0xff, HDMI_MC_CLKDIS);
+       dev_dbg(&hdmi->pdev->dev, "%s\n", __func__);
+       /* Disable All HDMI clock and bypass cec */
+       clkdis = hdmi_readb(HDMI_MC_CLKDIS);
+       clkdis |= 0x5f;
+       hdmi_writeb(clkdis, HDMI_MC_CLKDIS);
 
        mxc_hdmi_phy_disable(hdmi);