From 497e97cf7e6c3c01320b854b2d938498cafba76b Mon Sep 17 00:00:00 2001 From: Wyon Bi Date: Sat, 15 Dec 2018 16:22:54 +0800 Subject: [PATCH] ARM: dts: rockchip: clean up display nodes for rk3288 boards Change-Id: I6f954dd48fb5674db03477941ed0481bf2e698ab Signed-off-by: Wyon Bi --- arch/arm/boot/dts/rk3288-miniarm.dts | 9 ------- .../boot/dts/rk3288-popmetal-android-vga.dts | 2 -- arch/arm/boot/dts/rk3288-popmetal-android.dts | 2 -- arch/arm/boot/dts/rk3288-popmetal.dts | 2 -- arch/arm/boot/dts/rk3288-th804.dts | 17 ++++++------ .../boot/dts/rk3288-x7811-rk818-dual-dsi.dts | 27 +++++++++++-------- 6 files changed, 24 insertions(+), 35 deletions(-) diff --git a/arch/arm/boot/dts/rk3288-miniarm.dts b/arch/arm/boot/dts/rk3288-miniarm.dts index a5c5300797ab..2508eb6c1766 100644 --- a/arch/arm/boot/dts/rk3288-miniarm.dts +++ b/arch/arm/boot/dts/rk3288-miniarm.dts @@ -220,15 +220,6 @@ status = "ok"; }; -&dsi0 { - status = "disabled"; - mipi_panel: mipi-panel { - compatible ="asus,tc358762"; - reg = <0>; - status = "okay"; - }; -}; - &gpu { mali-supply = <&vdd_gpu>; status = "okay"; diff --git a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts index 0d10abb99d1c..174a9a828427 100644 --- a/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts +++ b/arch/arm/boot/dts/rk3288-popmetal-android-vga.dts @@ -269,8 +269,6 @@ }; &lvds { - pinctrl-names = "default"; - pinctrl-0 = <&lcdc_ctl>; status = "okay"; ports { diff --git a/arch/arm/boot/dts/rk3288-popmetal-android.dts b/arch/arm/boot/dts/rk3288-popmetal-android.dts index d207e33dd373..fbb65b71bffb 100644 --- a/arch/arm/boot/dts/rk3288-popmetal-android.dts +++ b/arch/arm/boot/dts/rk3288-popmetal-android.dts @@ -230,8 +230,6 @@ }; &lvds { - pinctrl-names = "default"; - pinctrl-0 = <&lcdc_ctl>; status = "okay"; }; diff --git a/arch/arm/boot/dts/rk3288-popmetal.dts b/arch/arm/boot/dts/rk3288-popmetal.dts index 944d99deb8e2..19f00da2981e 100644 --- a/arch/arm/boot/dts/rk3288-popmetal.dts +++ b/arch/arm/boot/dts/rk3288-popmetal.dts @@ -251,8 +251,6 @@ }; &lvds { - pinctrl-names = "default"; - pinctrl-0 = <&lcdc_ctl>; status = "okay"; ports { diff --git a/arch/arm/boot/dts/rk3288-th804.dts b/arch/arm/boot/dts/rk3288-th804.dts index 8e2610431381..cd564e366cfb 100644 --- a/arch/arm/boot/dts/rk3288-th804.dts +++ b/arch/arm/boot/dts/rk3288-th804.dts @@ -518,22 +518,21 @@ rockchip,lane-rate = <1000>; status = "okay"; - panel: panel@0 { + panel@0 { compatible = "simple-panel-dsi"; reg = <0>; backlight = <&backlight>; - reset-gpios = <&gpio7 4 GPIO_ACTIVE_LOW>; power-supply = <&vcc_lcd>; - dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | - MIPI_DSI_MODE_EOT_PACKET)>; - dsi,format = ; - dsi,lanes = <8>; - + reset-gpios = <&gpio7 4 GPIO_ACTIVE_LOW>; reset-delay-ms = <20>; init-delay-ms = <20>; enable-delay-ms = <20>; prepare-delay-ms = <20>; - status = "okay"; + + dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | + MIPI_DSI_MODE_EOT_PACKET)>; + dsi,format = ; + dsi,lanes = <8>; panel-init-sequence = [ 05 14 01 01 @@ -549,7 +548,7 @@ 05 96 01 10 ]; - disp_timings: display-timings { + display-timings { native-mode = <&timing0>; timing0: timing0 { diff --git a/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts b/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts index 5b159c9156b5..f4500ee402c9 100644 --- a/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts +++ b/arch/arm/boot/dts/rk3288-x7811-rk818-dual-dsi.dts @@ -324,26 +324,26 @@ }; &dsi0 { - status = "okay"; rockchip,dual-channel = <&dsi1>; rockchip,lane-rate = <900>; + status = "okay"; - panel: panel@0 { + panel@0 { compatible = "simple-panel-dsi"; reg = <0>; backlight = <&backlight>; - reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; power-supply = <&vcc_lcd>; - dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | - MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>; - dsi,format = ; - dsi,lanes = <8>; - + reset-gpios = <&gpio1 24 GPIO_ACTIVE_LOW>; reset-delay-ms = <120>; init-delay-ms = <120>; enable-delay-ms = <120>; prepare-delay-ms = <120>; + dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | + MIPI_DSI_MODE_LPM | MIPI_DSI_MODE_EOT_PACKET)>; + dsi,format = ; + dsi,lanes = <8>; + panel-init-sequence = [ 05 64 01 11 05 14 01 29 @@ -354,7 +354,7 @@ 05 96 01 10 ]; - disp_timings: display-timings { + display-timings { native-mode = <&timing0>; timing0: timing0 { @@ -380,12 +380,17 @@ status = "okay"; }; -&hdmi { +&dsi0_in_vopl { + status = "okay"; +}; + +&dsi0_in_vopb { status = "disabled"; }; &route_dsi0 { - status = "disabled"; + connect = <&vopl_out_dsi0>; + status = "okay"; }; &tsadc {