move screen power control to board dts,because it's board specifc

diff --git a/arch/arm/boot/dts/lcd-LP097Qx1.dtsi b/arch/arm/boot/dts/lcd-LP097Qx1.dtsi
index b705aefba93328aeb94866f0958a1bc2fee00d5c..33626cee3d666be8e892b9fbdc19053dd0849686 100644 (file)
--- a/arch/arm/boot/dts/lcd-LP097Qx1.dtsi
+++ b/arch/arm/boot/dts/lcd-LP097Qx1.dtsi
@@ -1,35 +1,9 @@
 /*
- * RockChip. LCD_B101ew05
+ * RockChip. DisplayPort screen LP097QX1
  *
  */
 
 / {
-               disp_power_ctr: power_ctr {
-                        rockchip,debug = <0>;
-                        /*lcd_en:lcd_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_B0 1>;
-                                rockchip,delay = <10>;
-                        };
-
-                       bl_en:bl_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_A2 1>;
-                                rockchip,delay = <10>;
-                        };
-
-                        bl_ctr:bl_ctr {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio3 GPIO_D6 1>;
-                                rockchip,delay = <10>;
-                        };
-
-                        lcd_rst:lcd_rst {
-                                rockchip,power_type = <REGULATOR>;
-                                rockchip,delay = <5>;
-                        };*/
-
-                };
 
                disp_timings: display-timings {
                         native-mode = <&timing0>;

diff --git a/arch/arm/boot/dts/lcd-b101ew05.dtsi b/arch/arm/boot/dts/lcd-b101ew05.dtsi
index 26baecda7d986a2a1d48ebbf8afaef6f5dc503cd..2d79841e5abdd5ea3121e0354af5d099fe73fdd0 100644 (file)
--- a/arch/arm/boot/dts/lcd-b101ew05.dtsi
+++ b/arch/arm/boot/dts/lcd-b101ew05.dtsi
@@ -4,37 +4,11 @@
  */
 
 / {
-               disp_power_ctr: power_ctr {
-                        rockchip,debug = <0>;
-                        lcd_en:lcd_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>;
-                                rockchip,delay = <10>;
-                        };
-
-                     /*   bl_en:bl_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
-                                rockchip,delay = <10>;
-                        };
-
-                        bl_ctr:bl_ctr {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
-                                rockchip,delay = <10>;
-                        };
-
-                        lcd_rst:lcd_rst {
-                                rockchip,power_type = <REGULATOR>;
-                                rockchip,delay = <5>;
-                        };*/
-
-                };
 
                disp_timings: display-timings {
                         native-mode = <&timing0>;
                         timing0: timing0 {
-                               screen-ype = <SCREEN_LVDS>;
+                               screen-type = <SCREEN_LVDS>;
                                lvds-format = <LVDS_8BIT_2>;
                                out-face    = <OUT_D888_P666>;
                                clock-frequency = <71000000>;

diff --git a/arch/arm/boot/dts/lcd-td043mgeal.dtsi b/arch/arm/boot/dts/lcd-td043mgeal.dtsi
index 0f1764e3af553810470c53a6bbe8f5aef189963a..07a2b7877c651525f122b06d75e8ea4dd34f494c 100755 (executable)
--- a/arch/arm/boot/dts/lcd-td043mgeal.dtsi
+++ b/arch/arm/boot/dts/lcd-td043mgeal.dtsi
@@ -1,50 +1,24 @@
 /*
- * RockChip. LCD_TD043MGEA1 FOR FPGA\r
+ * RockChip. LCD_TD043MGEA1 FOR FPGA
  *
  */
 
 / {
-               disp_power_ctr: power_ctr {
-                        rockchip,debug = <0>;
-                        lcd_en:lcd_en {\r
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>;
-                                rockchip,delay = <10>;
-                        };\r
-
-                     /*   bl_en:bl_en {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
-                                rockchip,delay = <10>;
-                        };
-
-                        bl_ctr:bl_ctr {
-                                rockchip,power_type = <GPIO>;
-                                gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
-                                rockchip,delay = <10>;
-                        };
-
-                        lcd_rst:lcd_rst {
-                                rockchip,power_type = <REGULATOR>;
-                                rockchip,delay = <5>;
-                        };*/
-
-                };
 
                disp_timings: display-timings {
                         native-mode = <&timing0>;
                         timing0: timing0 {
                                screen-type = <SCREEN_RGB>;
-                               out-face    = <OUT_P888>;\r
-                               clock-frequency = <27000000>;\r
-                               hactive = <800>;\r
-                               vactive = <480>;\r
-                               hback-porch = <206>;\r
-                               hfront-porch = <40>;\r
-                               vback-porch = <25>;\r
-                               vfront-porch = <10>;\r
+                               out-face    = <OUT_P888>;
+                               clock-frequency = <27000000>;
+                               hactive = <800>;
+                               vactive = <480>;
+                               hback-porch = <206>;
+                               hfront-porch = <40>;
+                               vback-porch = <25>;
+                               vfront-porch = <10>;
                                hsync-len = <10>;
-                               vsync-len = <10>;\r
+                               vsync-len = <10>;
                                hsync-active = <0>;
                                vsync-active = <0>;
                                de-active = <0>;

diff --git a/arch/arm/boot/dts/rk3188-lr097.dts b/arch/arm/boot/dts/rk3188-lr097.dts
index 4783b2b8efcaec7110b458fcf2f76a2c52e79b48..cc1e7ac6756d0a84b68b71f82db81e99aad5c42f 100644 (file)
--- a/arch/arm/boot/dts/rk3188-lr097.dts
+++ b/arch/arm/boot/dts/rk3188-lr097.dts
@@ -230,7 +230,6 @@
 
 &lcdc0 {
        status = "okay";
-       power_ctr = <&disp_power_ctr>;
 };
 
 &lcdc1 {

diff --git a/arch/arm/boot/dts/rk3188-tb.dts b/arch/arm/boot/dts/rk3188-tb.dts
index d75078f127bab01448bee1dbe1e14c32ad70306b..2d9de7a0a443794697fa663ab53df0647f45d7cf 100644 (file)
--- a/arch/arm/boot/dts/rk3188-tb.dts
+++ b/arch/arm/boot/dts/rk3188-tb.dts
@@ -247,7 +247,32 @@
 
 &lcdc0 {
        status = "okay";
-       power_ctr = <&disp_power_ctr>;
+       power_ctr: power_ctr {
+               rockchip,debug = <0>;
+               lcd_en:lcd_en {
+                       rockchip,power_type = <GPIO>;
+                       gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>;
+                       rockchip,delay = <10>;
+               };
+
+                     /*   bl_en:bl_en {
+                                rockchip,power_type = <GPIO>;
+                                gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>;
+                                rockchip,delay = <10>;
+                        };
+
+                        bl_ctr:bl_ctr {
+                                rockchip,power_type = <GPIO>;
+                                gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>;
+                                rockchip,delay = <10>;
+                        };
+
+                        lcd_rst:lcd_rst {
+                                rockchip,power_type = <REGULATOR>;
+                                rockchip,delay = <5>;
+                        };*/
+
+       };
 };
 
 &lcdc1 {