From: zwl <zwl@rockchips.com>
Date: Thu, 31 Jul 2014 07:31:56 +0000 (+0800)
Subject: rk312x dtsi: enable hdmi dt node
X-Git-Tag: firefly_0821_release~4916^2~101
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=3ba44c468ff50e7fd12f3fcb09b61d9f27c78edc;p=firefly-linux-kernel-4.4.55.git

rk312x dtsi: enable hdmi dt node
---

diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index 285220f12aa5..5ddcf80c1b7f 100644
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -165,6 +165,10 @@
 		};
 	};
 
+	&hdmi {
+		status = "okay";
+	};
+
 /include/ "rk818.dtsi"
 &rk818 {
 	gpios =<&gpio1 GPIO_B1 GPIO_ACTIVE_HIGH>,<&gpio1 GPIO_A1 GPIO_ACTIVE_LOW>;
diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 0bd6ee2ece34..630506037939 100755
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -630,7 +630,7 @@
 	};
 
 	hdmi: hdmi@20034000 {
-		compatible = "rockchip,rk3036-hdmi";
+		compatible = "rockchip,rk312x-hdmi";
 		reg = <0x20034000 0x4000>;
 		interrupts = <GIC_SPI 45 IRQ_TYPE_LEVEL_HIGH>;
 		rockchip,hdmi_lcdc_source = <0>;