From: Zheng Yang <zhengyang@rock-chips.com>
Date: Mon, 24 Aug 2015 09:44:13 +0000 (+0800)
Subject: hdmi:rk3288/rk3368: clear scrambling bit and SCDC register when switching to v1.4... 
X-Git-Tag: firefly_0821_release~3831
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=301b827dd538e9d5e257ec0bb536f5b71a8c11bc;p=firefly-linux-kernel-4.4.55.git

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

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 e966be1e19f6..890d08266582 100755
--- 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,