From 1c28a3c266e125c7a4aafbf5d011aa0dce2ca21c Mon Sep 17 00:00:00 2001 From: Huang Jiachai Date: Fri, 3 Jun 2016 16:39:49 +0800 Subject: [PATCH] ARM64: dts: rk3399: android: update dts config for vop Change-Id: If2767606e154bfd5ba9d1d9481a4aeb18d1070d5 Signed-off-by: Huang Jiachai --- .../boot/dts/rockchip/rk3399-android.dtsi | 28 ++++------------ .../dts/rockchip/rk3399-evb-rev1-android.dts | 33 +++++++++++++++++++ .../dts/rockchip/rk3399-evb-rev2-android.dts | 33 +++++++++++++++++++ 3 files changed, 72 insertions(+), 22 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi index 923ece3d478e..6571560b9806 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -220,16 +220,18 @@ }; fb: fb { + status = "okay"; compatible = "rockchip,rk-fb"; rockchip,disp-mode = ; }; rk_screen: screen { + status = "okay"; compatible = "rockchip,screen"; - #include }; vopb_rk_fb: vop-rk-fb@ff900000 { + status = "disabled"; compatible = "rockchip,rk3399-lcdc"; rockchip,prop = ; reg = <0x0 0xff900000 0x0 0x3efc>; @@ -242,30 +244,10 @@ rockchip,pwr18 = <0>; rockchip,iommu-enabled = <1>; power-domains = <&power RK3399_PD_VOPB>; - power_ctr: power_ctr { - /*rockchip,debug = <0>; - lcd_en: lcd-en { - rockchip,power_type = ; - gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;//GPIO_C6 = 22 - rockchip,delay = <10>; - }; - */ - - /*lcd_cs: lcd-cs { - rockchip,power_type = ; - gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;//GPIO_C5 = 21 - rockchip,delay = <10>; - };*/ - - /*lcd_rst: lcd-rst { - rockchip,power_type = ; - gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>; - rockchip,delay = <5>; - };*/ - }; }; vopb_mmu_rk_fb: vopb-mmu { + status = "okay"; dbgname = "vop"; compatible = "rockchip,vopb_mmu"; reg = <0x0 0xff903f00 0x0 0x100>; @@ -274,6 +256,7 @@ }; vopl_rk_fb: vop-rk-fb@ff8f0000 { + status = "disabled"; compatible = "rockchip,rk3399-lcdc"; rockchip,prop = ; reg = <0x0 0xff8f0000 0x0 0x3efc>; @@ -289,6 +272,7 @@ }; vopl_mmu_rk_fb: vopl-mmu { + status = "okay"; dbgname = "vop"; compatible = "rockchip,vopl_mmu"; reg = <0x0 0xff8f3f00 0x0 0x100>; 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 f048f6c2787c..97f2f2d084a1 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -59,3 +59,36 @@ rockchip,pwm_id= <3>; rockchip,pwm_voltage = <900000>; }; + +&rk_screen { + #include +}; + +&vopb_rk_fb { + status = "okay"; + power_ctr: power_ctr { + /*rockchip,debug = <0>; + lcd_en: lcd-en { + rockchip,power_type = ; + gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;//GPIO_C6 = 22 + rockchip,delay = <10>; + }; + */ + + /*lcd_cs: lcd-cs { + rockchip,power_type = ; + gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;//GPIO_C5 = 21 + rockchip,delay = <10>; + };*/ + + /*lcd_rst: lcd-rst { + rockchip,power_type = ; + gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>; + rockchip,delay = <5>; + };*/ + }; +}; + +&vopl_rk_fb { + 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 d7cd846c215f..20dde52ac7f8 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -54,3 +54,36 @@ rockchip,pwm_id= <3>; rockchip,pwm_voltage = <900000>; }; + +&rk_screen { + #include +}; + +&vopb_rk_fb { + status = "okay"; + power_ctr: power_ctr { + /*rockchip,debug = <0>; + lcd_en: lcd-en { + rockchip,power_type = ; + gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>;//GPIO_C6 = 22 + rockchip,delay = <10>; + }; + */ + + /*lcd_cs: lcd-cs { + rockchip,power_type = ; + gpios = <&gpio0 21 GPIO_ACTIVE_HIGH>;//GPIO_C5 = 21 + rockchip,delay = <10>; + };*/ + + /*lcd_rst: lcd-rst { + rockchip,power_type = ; + gpios = <&gpio3 GPIO_D6 GPIO_ACTIVE_HIGH>; + rockchip,delay = <5>; + };*/ + }; +}; + +&vopl_rk_fb { + status = "okay"; +}; -- 2.34.1