From 878fd85fce66d024788af47a4ca2a35e81d77425 Mon Sep 17 00:00:00 2001 From: xubilv Date: Wed, 29 Jun 2016 18:05:51 +0800 Subject: [PATCH] ARM64: dts: rk3399: lcd_en control in vop Change-Id: I94f514ecc3367b11838910b1cdd0d0f3b29a24c3 Signed-off-by: xubilv Signed-off-by: Jianqun Xu --- arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts | 5 ++--- arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts | 2 ++ arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts | 5 ++--- arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts | 2 ++ arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi | 1 - 5 files changed, 8 insertions(+), 7 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts index 5cfff39b4f30..7226fa16ee2b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -67,13 +67,12 @@ &vopb_rk_fb { status = "okay"; power_ctr: power_ctr { - /*rockchip,debug = <0>; + rockchip,debug = <0>; lcd_en: lcd-en { rockchip,power_type = ; - gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;//GPIO_C6 = 22 + gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; rockchip,delay = <10>; }; - */ /*lcd_cs: lcd-cs { rockchip,power_type = ; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts index 758aa5da505c..9f3d17c8e5ee 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-cros.dts @@ -52,6 +52,7 @@ compatible = "lg,lp097qx1-spa1", "panel-simple"; backlight = <&backlight>; power-supply = <&vcc3v3_s0>; + enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; ports { panel_in_edp: endpoint { @@ -67,6 +68,7 @@ compatible ="boe,tv080wum-nl0"; reg = <0>; backlight = <&backlight>; + enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts index e08ec2769d63..1f9e58c1423d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -62,13 +62,12 @@ &vopb_rk_fb { status = "okay"; power_ctr: power_ctr { - /*rockchip,debug = <0>; + rockchip,debug = <0>; lcd_en: lcd-en { rockchip,power_type = ; - gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;//GPIO_C6 = 22 + gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; rockchip,delay = <10>; }; - */ /*lcd_cs: lcd-cs { rockchip,power_type = ; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts index 0a698a404151..45998cb6d8c1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-cros.dts @@ -52,6 +52,7 @@ compatible = "lg,lp097qx1-spa1", "panel-simple"; backlight = <&backlight>; power-supply = <&vcc3v3_s0>; + enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; ports { panel_in_edp: endpoint { @@ -67,6 +68,7 @@ compatible ="boe,tv080wum-nl0"; reg = <0>; backlight = <&backlight>; + enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; status = "okay"; }; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi index 98e45e2b2ff7..a1a4bea28224 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb.dtsi @@ -102,7 +102,6 @@ 240 241 242 243 244 245 246 247 248 249 250 251 252 253 254 255>; default-brightness-level = <200>; - enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; }; clkin_gmac: external-gmac-clock { -- 2.34.1