From: zwl <zwl@rockchips.com>
Date: Tue, 12 Aug 2014 15:22:17 +0000 (+0800)
Subject: rk312x dts: move the pinctrl config of lvds node from dtsi to dts that is need
X-Git-Tag: firefly_0821_release~4910
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=6fa15cd64ec5573d1145649797d16b50f6655b26;p=firefly-linux-kernel-4.4.55.git

rk312x dts: move the pinctrl config of lvds node from dtsi to dts that is need
---

diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 0cc5cb71ebe7..51d39748b2a6 100755
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -26,6 +26,14 @@
 	display-timings = <&disp_timings>;
 };
 
+&lvds {
+	status = "okay";
+
+	pinctrl-names = "lcdc", "sleep";
+	pinctrl-0 = <&lcdc0_lcdc_d>;
+	pinctrl-1 = <&lcdc0_lcdc_gpio>;
+};
+
 &lcdc {
 	status = "okay";
 
diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 9215d94fb361..091f2e87b6c1 100755
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -696,9 +696,6 @@
 		reg = <0x20038000 0x4000>;
 		clocks = <&clk_gates5 0>;
 		clock-names = "pclk_lvds";
-		pinctrl-names = "lcdc", "sleep";
-		pinctrl-0 = <&lcdc0_lcdc_d>;
-		pinctrl-1 = <&lcdc0_lcdc_gpio>;
 	};
 
 	lcdc: lcdc@1010e000 {