hdmi:rk3288/rk3368: clear scrambling bit and SCDC register when switching to v1.4...

Signed-off-by: Zheng Yang <zhengyang@rock-chips.com>

diff --git a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
index e966be1e19f6a86a8c6ccd85db097e2836fdab2f..890d08266582e3ee06065354f1af2128f29e8588 100755 (executable)
--- a/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
+++ b/drivers/video/rockchip/hdmi/rockchip-hdmiv2/rockchip_hdmiv2_hw.c
@@ -570,7 +570,7 @@ static int rockchip_hdmiv2_video_framecomposer(struct hdmi *hdmi_drv,
                tmdsclk = mode->pixclock;
        }
 
-       if ((tmdsclk > 340000000 && hdmi_dev->tmdsclk < 340000000) ||
+       if ((tmdsclk > 340000000) ||
            (tmdsclk < 340000000 && hdmi_dev->tmdsclk > 340000000))
                hdmi_dev->tmdsclk_ratio_change = true;
        else
@@ -609,6 +609,9 @@ static int rockchip_hdmiv2_video_framecomposer(struct hdmi *hdmi_drv,
                        rockchip_hdmiv2_scrambling_enable(hdmi_dev, 0);
                        mutex_unlock(&hdmi_dev->ddc_lock);
                }
+       } else {
+               hdmi_msk_reg(hdmi_dev, FC_SCRAMBLER_CTRL,
+                            m_FC_SCRAMBLE_EN, v_FC_SCRAMBLE_EN(0));
        }
 
        hdmi_msk_reg(hdmi_dev, FC_INVIDCONF,
@@ -1596,7 +1599,6 @@ static int hdmi_dev_control_output(struct hdmi *hdmi, int enable)
                        if (hdmi->ops->hdcp_power_off_cb)
                                hdmi->ops->hdcp_power_off_cb(hdmi);
                        rockchip_hdmiv2_powerdown(hdmi_dev);
-                       hdmi_dev->tmdsclk = 0;
 /*
                        hdmi_msk_reg(hdmi_dev, PHY_CONF0,
                                     m_PDDQ_SIG | m_TXPWRON_SIG,