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 5656091db289128e8ab709f15999f1d4031d0dd7..24094b36fb8bc4564af915118f50480489b66e63 100755 (executable)
--- 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 2bcead9b615312451be2b5cfe8b5ba0bf824b7b8..a9a0de5aa84762313eb7cee6abebb2256dd344d2 100755 (executable)
--- 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 b7d362ba303dd678b684e8c07e86f39d8bb1b1b4..2f7760ac3b3883e0fcf4c7f293b9d9d036a9e04c 100755 (executable)
--- 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 3113221b7011dfaf53ae39ff77121ca7879672f3..b587bc91f4afcee2a13c1a92546e1f92515c2d02 100755 (executable)
--- 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>;