From 964cbd4c3311d8d28f376ec9e38378a09fbc88f0 Mon Sep 17 00:00:00 2001 From: yxj Date: Fri, 14 Mar 2014 10:16:59 +0800 Subject: [PATCH] move screen power control to board dts,because it's board specifc --- arch/arm/boot/dts/lcd-LP097Qx1.dtsi | 28 +--------------- arch/arm/boot/dts/lcd-b101ew05.dtsi | 28 +--------------- arch/arm/boot/dts/lcd-td043mgeal.dtsi | 46 ++++++--------------------- arch/arm/boot/dts/rk3188-lr097.dts | 1 - arch/arm/boot/dts/rk3188-tb.dts | 27 +++++++++++++++- 5 files changed, 38 insertions(+), 92 deletions(-) diff --git a/arch/arm/boot/dts/lcd-LP097Qx1.dtsi b/arch/arm/boot/dts/lcd-LP097Qx1.dtsi index b705aefba933..33626cee3d66 100644 --- 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 = ; - gpios = <&gpio0 GPIO_B0 1>; - rockchip,delay = <10>; - }; - - bl_en:bl_en { - rockchip,power_type = ; - gpios = <&gpio0 GPIO_A2 1>; - rockchip,delay = <10>; - }; - - bl_ctr:bl_ctr { - rockchip,power_type = ; - gpios = <&gpio3 GPIO_D6 1>; - rockchip,delay = <10>; - }; - - lcd_rst:lcd_rst { - rockchip,power_type = ; - 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 26baecda7d98..2d79841e5abd 100644 --- 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 = ; - gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>; - rockchip,delay = <10>; - }; - - /* bl_en:bl_en { - rockchip,power_type = ; - gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>; - rockchip,delay = <10>; - }; - - bl_ctr:bl_ctr { - rockchip,power_type = ; - gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>; - rockchip,delay = <10>; - }; - - lcd_rst:lcd_rst { - rockchip,power_type = ; - rockchip,delay = <5>; - };*/ - - }; disp_timings: display-timings { native-mode = <&timing0>; timing0: timing0 { - screen-ype = ; + screen-type = ; lvds-format = ; out-face = ; clock-frequency = <71000000>; diff --git a/arch/arm/boot/dts/lcd-td043mgeal.dtsi b/arch/arm/boot/dts/lcd-td043mgeal.dtsi index 0f1764e3af55..07a2b7877c65 100755 --- 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 + * RockChip. LCD_TD043MGEA1 FOR FPGA * */ / { - disp_power_ctr: power_ctr { - rockchip,debug = <0>; - lcd_en:lcd_en { - rockchip,power_type = ; - gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>; - rockchip,delay = <10>; - }; - - /* bl_en:bl_en { - rockchip,power_type = ; - gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>; - rockchip,delay = <10>; - }; - - bl_ctr:bl_ctr { - rockchip,power_type = ; - gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>; - rockchip,delay = <10>; - }; - - lcd_rst:lcd_rst { - rockchip,power_type = ; - rockchip,delay = <5>; - };*/ - - }; disp_timings: display-timings { native-mode = <&timing0>; timing0: timing0 { screen-type = ; - out-face = ; - clock-frequency = <27000000>; - hactive = <800>; - vactive = <480>; - hback-porch = <206>; - hfront-porch = <40>; - vback-porch = <25>; - vfront-porch = <10>; + out-face = ; + 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>; + 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 4783b2b8efca..cc1e7ac6756d 100644 --- 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 d75078f127ba..2d9de7a0a443 100644 --- 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 = ; + gpios = <&gpio0 GPIO_B0 GPIO_ACTIVE_HIGH>; + rockchip,delay = <10>; + }; + + /* bl_en:bl_en { + rockchip,power_type = ; + gpios = <&gpio0 GPIO_A2 GPIO_ACTIVE_HIGH>; + rockchip,delay = <10>; + }; + + bl_ctr:bl_ctr { + rockchip,power_type = ; + gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>; + rockchip,delay = <10>; + }; + + lcd_rst:lcd_rst { + rockchip,power_type = ; + rockchip,delay = <5>; + };*/ + + }; }; &lcdc1 { -- 2.34.1