From: zwl <zwl@rockchips.com>
Date: Thu, 7 Aug 2014 10:02:57 +0000 (+0800)
Subject: rk312x dts: move lcdc pinctrl and screen from dtsi to dts
X-Git-Tag: firefly_0821_release~4916^2~35
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2669a870f496cefa4264e96fb2898fa45bf9098a;p=firefly-linux-kernel-4.4.55.git

rk312x dts: move lcdc pinctrl and screen from dtsi to dts
---

diff --git a/arch/arm/boot/dts/rk3126-sdk.dts b/arch/arm/boot/dts/rk3126-sdk.dts
index 5656091db289..24094b36fb8b 100755
--- a/arch/arm/boot/dts/rk3126-sdk.dts
+++ b/arch/arm/boot/dts/rk3126-sdk.dts
@@ -1,4 +1,5 @@
 #include "rk312x-sdk.dtsi"
+#include "lcd-b101ew05.dtsi"
 
 / {
 	 compatible = "rockchip,rk3126";
@@ -11,9 +12,17 @@
         };
 };
 
+&rk_screen {
+	display-timings = <&disp_timings>;
+};
+
 &lcdc {
 	status = "okay";
 
+	pinctrl-names = "default", "gpio";
+	pinctrl-0 = <&lcdc0_lcdc>;
+	pinctrl-1 = <&lcdc0_gpio>;
+
 	power_ctr: power_ctr {
 		rockchip,debug = <0>;
 		lcd_en: lcd_en {
diff --git a/arch/arm/boot/dts/rk3128-sdk.dts b/arch/arm/boot/dts/rk3128-sdk.dts
index 2bcead9b6153..a9a0de5aa847 100755
--- a/arch/arm/boot/dts/rk3128-sdk.dts
+++ b/arch/arm/boot/dts/rk3128-sdk.dts
@@ -1,4 +1,5 @@
 #include "rk312x-sdk.dtsi"
+#include "lcd-b101ew05.dtsi"
 
 / {
 	 compatible = "rockchip,rk3128";
@@ -11,9 +12,17 @@
         };
 };
 
+&rk_screen {
+	display-timings = <&disp_timings>;
+};
+
 &lcdc {
 	status = "okay";
 
+	pinctrl-names = "default", "gpio";
+	pinctrl-0 = <&lcdc0_lcdc>;
+	pinctrl-1 = <&lcdc0_gpio>;
+
 	power_ctr: power_ctr {
 		rockchip,debug = <0>;
 		lcd_cs: lcd_cs {
diff --git a/arch/arm/boot/dts/rk312x-sdk.dtsi b/arch/arm/boot/dts/rk312x-sdk.dtsi
index b7d362ba303d..2f7760ac3b38 100755
--- a/arch/arm/boot/dts/rk312x-sdk.dtsi
+++ b/arch/arm/boot/dts/rk312x-sdk.dtsi
@@ -1,7 +1,6 @@
 /dts-v1/;
 
 #include "rk312x.dtsi"
-#include "lcd-b101ew05.dtsi"
 
 / {
 	fiq-debugger {
@@ -208,10 +207,6 @@
 	rockchip,uboot-logo-on = <0>;
 };
 
-&rk_screen {
-	display-timings = <&disp_timings>;
-};
-
 &hdmi {
 	status = "okay";
 };
diff --git a/arch/arm/boot/dts/rk312x.dtsi b/arch/arm/boot/dts/rk312x.dtsi
index 3113221b7011..b587bc91f4af 100755
--- a/arch/arm/boot/dts/rk312x.dtsi
+++ b/arch/arm/boot/dts/rk312x.dtsi
@@ -630,9 +630,6 @@
 		rockchip,prop = <PRMRY>;
 		reg = <0x1010e000 0x2000>;
 		interrupts = <GIC_SPI 9 IRQ_TYPE_LEVEL_HIGH>;
-		pinctrl-names = "default", "gpio";
-		pinctrl-0 = <&lcdc0_lcdc>;
-		pinctrl-1 = <&lcdc0_gpio>;
 		clocks = <&clk_gates6 0>, <&dclk_lcdc0>, <&clk_gates6 1>, <&sclk_lcdc0>;
 		clock-names = "aclk_lcdc", "dclk_lcdc", "hclk_lcdc", "sclk";
 		rockchip,iommu-enabled = <1>;