From: Zheng Yang <zhengyang@rock-chips.com>
Date: Sat, 9 Aug 2014 08:44:05 +0000 (+0800)
Subject: 	Support tve in rk3128_box_defconfig and rk3128-box.dts.
X-Git-Tag: firefly_0821_release~4916^2~17
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=926a2f1d1dd19ad1e2fb759934bc1a8533f03826;p=firefly-linux-kernel-4.4.55.git

	Support tve in rk3128_box_defconfig and rk3128-box.dts.
---

diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index 65d03c406780..f683c10e2794 100755
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -129,6 +129,10 @@
 	status = "okay";
 };
 
+&tve {
+	status = "okay";
+};
+
 &i2c2 {
 	status = "disabled";
 };
diff --git a/arch/arm/configs/rk3128_box_defconfig b/arch/arm/configs/rk3128_box_defconfig
index 25f2b412f03a..78aa565585c0 100644
--- a/arch/arm/configs/rk3128_box_defconfig
+++ b/arch/arm/configs/rk3128_box_defconfig
@@ -368,6 +368,8 @@ CONFIG_RK31XX_LVDS=y
 CONFIG_DP_ANX6345=y
 CONFIG_RK32_DP=y
 CONFIG_RK_HDMI=y
+CONFIG_RK_TVENCODER=y
+CONFIG_RK3036_TV_ENCODER=y
 CONFIG_ROCKCHIP_RGA=y
 CONFIG_ROCKCHIP_RGA2=y
 CONFIG_LOGO=y