From: yzq <yzq@rock-chips.com>
Date: Mon, 5 Nov 2012 08:00:09 +0000 (+0800)
Subject: rk2928 hdmi: fix hdmi switch status
X-Git-Tag: firefly_0821_release~8269^2~8
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=8caf82d8b3351e5497cbcb4d7a9c0a62a0a731aa;p=firefly-linux-kernel-4.4.55.git

rk2928 hdmi: fix hdmi switch status
---

diff --git a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.c b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.c
index 63bff24236c2..bf899706952f 100755
--- a/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.c
+++ b/drivers/video/rockchip/hdmi/chips/rk2928/rk2928_hdmi_hw.c
@@ -378,6 +378,8 @@ void rk2928_hdmi_control_output(int enable)
 	char mutestatus = 0;
 	
 	if(enable) {
+		if(hdmi->pwr_mode == LOWER_PWR)
+			rk2928_hdmi_set_pwr_mode(NORMAL);
 		mutestatus = HDMIRdReg(AV_MUTE);
 		if(mutestatus && (m_AUDIO_MUTE | m_VIDEO_BLACK)) {
 			HDMIWrReg(AV_MUTE, v_AUDIO_MUTE(0) | v_VIDEO_MUTE(0));
diff --git a/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c b/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c
index a93c32110839..5dd6fddee913 100755
--- a/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c
+++ b/drivers/video/rockchip/hdmi/rk_hdmi_sysfs.c
@@ -42,7 +42,7 @@ static int hdmi_set_enable(struct rk_display_device *device, int enable)
 	else {
 		if(hdmi->irq)
 			enable_irq(hdmi->irq);
-		#ifdef CONFIG_HDMI_RK610
+		#if defined(CONFIG_HDMI_RK610) || defined(CONFIG_HDMI_RK2928)
 			queue_delayed_work(hdmi->workqueue, &hdmi->delay_work, 0);
 		#endif
 		mutex_unlock(&hdmi->enable_mutex);