From: zwl <zwl@rockchips.com>
Date: Sat, 30 Aug 2014 08:42:05 +0000 (+0800)
Subject: rk312x:dts: modify hdmi dt node status at different dts
X-Git-Tag: firefly_0821_release~4769^2~22
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=28ffed9f6a3930bd03dfac19e4756b5b0c7906b4;p=firefly-linux-kernel-4.4.55.git

rk312x:dts: modify hdmi dt node status at different dts
---

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 790384bc70b5..7015997943d4 100755
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -72,6 +72,10 @@
 	};
 };
 
+&hdmi {
+        status = "disabled";
+};
+
 &key {
 		io-channels = <&adc 2>;
 		power-key {
diff --git a/arch/arm/boot/dts/rk3128-box.dts b/arch/arm/boot/dts/rk3128-box.dts
index e8a173b26e93..b19a86535a59 100755
--- a/arch/arm/boot/dts/rk3128-box.dts
+++ b/arch/arm/boot/dts/rk3128-box.dts
@@ -146,6 +146,10 @@
 	rockchip,fb-win-map = <FB0_WIN1_FB1_WIN0_FB2_WIN2>;
 };
 
+&hdmi {
+        status = "okay";
+};
+
 &tve {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 7096641c56f9..209a4ca02f7c 100755
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -56,6 +56,10 @@
 	};
 };
 
+&hdmi {
+        status = "okay";
+};
+
 &sdmmc {
 	cd-gpios = <&gpio1 GPIO_C1 GPIO_ACTIVE_HIGH>;/*CD GPIO*/
 };
diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index fc85b32e067f..47cfe8a8bf12 100755
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -202,9 +202,6 @@
 	rockchip,uboot-logo-on = <0>;
 };
 
-&hdmi {
-	status = "okay";
-};
 
 /include/ "rt5025.dtsi"
 &rt5025 {