diff options
| author | Sandor Yu <Sandor.yu@nxp.com> | 2017-10-11 15:58:43 +0800 |
|---|---|---|
| committer | Leonard Crestez <leonard.crestez@nxp.com> | 2018-08-24 12:41:33 +0300 |
| commit | d7709904fa87df6e5680c1a345586ec50615bcb1 (patch) | |
| tree | a8b5ed932e8a065c5c4413599aec37c188f6e8c7 /drivers/video | |
| parent | 66426cc28d810d14403d5fe3091f7e9c4a06e341 (diff) | |
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>
Diffstat (limited to 'drivers/video')
| -rw-r--r-- | drivers/video/fbdev/mxc/mxc_hdmi.c | 11 |
1 files changed, 7 insertions, 4 deletions
diff --git a/drivers/video/fbdev/mxc/mxc_hdmi.c b/drivers/video/fbdev/mxc/mxc_hdmi.c index ebec8d2dd8b8..9e844805c0d2 100644 --- 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); |