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

2026-06-08 11:50:43 +09:00 · 2014-08-30 16:42:05 +08:00
parent 77fa943ef3
commit 28ffed9f6a
4 changed files with 12 additions and 3 deletions
--- 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 {
--- 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";
 };
--- 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*/
 };
--- 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 {