From 65e55b14ab1e5278d9aa41648fd16a8f9ff2a878 Mon Sep 17 00:00:00 2001
From: Zheng Yang <zhengyang@rock-chips.com>
Date: Sat, 23 Aug 2014 16:12:43 +0800
Subject: [PATCH] rk3036/rk312x tve: fix reg wirte error when disable dac.

---
 drivers/video/rockchip/tve/rk3036/rk3036_tve.c | 4 ++++
 1 file changed, 4 insertions(+)

diff --git a/drivers/video/rockchip/tve/rk3036/rk3036_tve.c b/drivers/video/rockchip/tve/rk3036/rk3036_tve.c
index 57cf029427d1..47b888cc24a7 100644
--- a/drivers/video/rockchip/tve/rk3036/rk3036_tve.c
+++ b/drivers/video/rockchip/tve/rk3036/rk3036_tve.c
@@ -59,6 +59,10 @@ static void dac_enable(bool enable)
 	} else {
 		mask = m_VBG_EN | m_DAC_EN;
 		val = 0;
+		if (rk3036_tve->soctype == SOC_RK312X)
+			grfreg = RK312X_GRF_TVE_CON;
+		else if (rk3036_tve->soctype == SOC_RK3036)
+			grfreg = RK3036_GRF_SOC_CON3;
 	}
 	if (grfreg)
 		grf_writel(grfreg, (mask << 16) | val);
-- 
2.34.1