From b2046b12f270904f7b27e9efa7658c2cd1e44321 Mon Sep 17 00:00:00 2001 From: WeiYong Bi Date: Wed, 31 May 2017 15:56:16 +0800 Subject: [PATCH] arm64: dts: rockchip: rename mipi to dsi for rk3399 Change-Id: I6c6fb4e0399b805dfa012cc5562ad71103aa85e9 Signed-off-by: WeiYong Bi --- .../boot/dts/rockchip/rk3399-android.dtsi | 4 +-- .../boot/dts/rockchip/rk3399-evb-cros.dtsi | 6 ++--- .../dts/rockchip/rk3399-evb-rev1-android.dts | 13 +++++----- .../dts/rockchip/rk3399-evb-rev2-android.dts | 13 +++++----- .../dts/rockchip/rk3399-evb-rev3-android.dts | 13 +++++----- .../arm64/boot/dts/rockchip/rk3399-linux.dtsi | 4 +-- .../boot/dts/rockchip/rk3399-tve1205g.dts | 2 +- arch/arm64/boot/dts/rockchip/rk3399.dtsi | 25 ++++++++----------- 8 files changed, 40 insertions(+), 40 deletions(-) diff --git a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi index 4e73720e02f4..be8e293f76c7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-android.dtsi @@ -294,13 +294,13 @@ connect = <&vopb_out_hdmi>; }; - route_mipi: route-mipi { + route_dsi: route-dsi { status = "disabled"; logo,uboot = "logo.bmp"; logo,kernel = "logo_kernel.bmp"; logo,mode = "fullscreen"; charge_logo,mode = "center"; - connect = <&vopb_out_mipi>; + connect = <&vopb_out_dsi>; }; route_edp: route-edp { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi index bb5d901dadf4..177ec666c36d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-cros.dtsi @@ -91,14 +91,14 @@ }; }; -&mipi_dsi { +&dsi { status = "okay"; - panel { + + panel@0 { 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-rev1-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts index 087042474103..0a042206b74d 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev1-android.dts @@ -60,21 +60,22 @@ rockchip,pwm_voltage = <900000>; }; -&mipi_dsi { +&dsi { status = "okay"; - panel { + + panel@0 { compatible ="simple-panel-dsi"; reg = <0>; backlight = <&backlight>; enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | - MIPI_DSI_MODE_VIDEO_SYNC_PULSE)>; + + dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>; dsi,format = ; dsi,lanes = <4>; - status = "okay"; display-timings { native-mode = <&timing0>; + timing0: timing0 { clock-frequency = <160000000>; hactive = <1200>; @@ -94,6 +95,6 @@ }; }; -&route_mipi { +&route_dsi { 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 31077f7f47d3..890ef6747fc6 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev2-android.dts @@ -71,21 +71,22 @@ status = "okay"; }; -&mipi_dsi { +&dsi { status = "okay"; - panel { + + panel@0 { compatible ="simple-panel-dsi"; reg = <0>; backlight = <&backlight>; enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | - MIPI_DSI_MODE_VIDEO_SYNC_PULSE)>; + + dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>; dsi,format = ; dsi,lanes = <4>; - status = "okay"; display-timings { native-mode = <&timing0>; + timing0: timing0 { clock-frequency = <160000000>; hactive = <1200>; @@ -105,6 +106,6 @@ }; }; -&route_mipi { +&route_dsi { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts index 6106b9dda067..f08960133ff5 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-evb-rev3-android.dts @@ -50,21 +50,22 @@ compatible = "rockchip,android", "rockchip,rk3399-evb-rev3", "rockchip,rk3399"; }; -&mipi_dsi { +&dsi { status = "okay"; - panel { + + panel@0 { compatible ="simple-panel-dsi"; reg = <0>; backlight = <&backlight>; enable-gpios = <&gpio1 13 GPIO_ACTIVE_HIGH>; - dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST | - MIPI_DSI_MODE_VIDEO_SYNC_PULSE)>; + + dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>; dsi,format = ; dsi,lanes = <4>; - status = "okay"; display-timings { native-mode = <&timing0>; + timing0: timing0 { clock-frequency = <160000000>; hactive = <1200>; @@ -89,6 +90,6 @@ status = "okay"; }; -&route_mipi { +&route_dsi { status = "okay"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi index ed3adce65464..03519140cdb7 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399-linux.dtsi @@ -99,13 +99,13 @@ connect = <&vopl_out_hdmi>; }; - route_mipi: route-mipi { + route_dsi: route-dsi { status = "disabled"; logo,uboot = "logo.bmp"; logo,kernel = "logo_kernel.bmp"; logo,mode = "fullscreen"; charge_logo,mode = "center"; - connect = <&vopb_out_mipi>; + connect = <&vopb_out_dsi>; }; route_edp: route-edp { diff --git a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts index 0bef17c88d56..24e10d52e808 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts +++ b/arch/arm64/boot/dts/rockchip/rk3399-tve1205g.dts @@ -830,7 +830,7 @@ gpio1830-supply = <&vcc_3v0>; }; -&mipi_dsi { +&dsi { status = "disabled"; }; diff --git a/arch/arm64/boot/dts/rockchip/rk3399.dtsi b/arch/arm64/boot/dts/rockchip/rk3399.dtsi index 103a733ecdef..154aae30667b 100644 --- a/arch/arm64/boot/dts/rockchip/rk3399.dtsi +++ b/arch/arm64/boot/dts/rockchip/rk3399.dtsi @@ -1731,9 +1731,9 @@ #address-cells = <1>; #size-cells = <0>; - vopl_out_mipi: endpoint@0 { + vopl_out_dsi: endpoint@0 { reg = <0>; - remote-endpoint = <&mipi_in_vopl>; + remote-endpoint = <&dsi_in_vopl>; }; vopl_out_edp: endpoint@1 { @@ -1800,9 +1800,9 @@ remote-endpoint = <&edp_in_vopb>; }; - vopb_out_mipi: endpoint@1 { + vopb_out_dsi: endpoint@1 { reg = <1>; - remote-endpoint = <&mipi_in_vopb>; + remote-endpoint = <&dsi_in_vopb>; }; vopb_out_hdmi: endpoint@2 { @@ -1895,7 +1895,7 @@ }; }; - mipi_dsi: mipi@ff960000 { + dsi: dsi@ff960000 { compatible = "rockchip,rk3399-mipi-dsi", "snps,dw-mipi-dsi"; reg = <0x0 0xff960000 0x0 0x8000>; interrupts = ; @@ -1909,21 +1909,18 @@ status = "disabled"; ports { - #address-cells = <1>; - #size-cells = <0>; - reg = <1>; - - mipi_in: port { + port { #address-cells = <1>; #size-cells = <0>; - mipi_in_vopb: endpoint@0 { + dsi_in_vopb: endpoint@0 { reg = <0>; - remote-endpoint = <&vopb_out_mipi>; + remote-endpoint = <&vopb_out_dsi>; }; - mipi_in_vopl: endpoint@1 { + + dsi_in_vopl: endpoint@1 { reg = <1>; - remote-endpoint = <&vopl_out_mipi>; + remote-endpoint = <&vopl_out_dsi>; }; }; }; -- 2.34.1