From: WeiYong Bi <bivvy.bi@rock-chips.com>
Date: Thu, 13 Jul 2017 08:10:11 +0000 (+0800)
Subject: ARM64: dts: rockchip: rename mipi to dsi for rk3368
X-Git-Tag: release-20171130_firefly~4^2~152
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b2b7438b820f564d6bca03dd1047167c233158ea;p=firefly-linux-kernel-4.4.55.git

ARM64: dts: rockchip: rename mipi to dsi for rk3368

Change-Id: Ied02b4d521ad3c49ce7b7a591a3d3f8544182e12
Signed-off-by: WeiYong Bi <bivvy.bi@rock-chips.com>
---

diff --git a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
index 5f55efc1bf43..ade38029e6cd 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368-android.dtsi
@@ -141,13 +141,13 @@
 
 	memory-region = <&drm_logo>;
 	route {
-		route_mipi: route-mipi {
+		route_dsi: route-dsi {
 			status = "disabled";
 			logo,uboot = "logo.bmp";
 			logo,kernel = "logo_kernel.bmp";
 			logo,mode = "center";
 			charge_logo,mode = "center";
-			connect = <&vop_out_mipi>;
+			connect = <&vop_out_dsi>;
 		};
 
 		route_edp: route-edp {
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
index bc0e0e282bc9..f7272b516d51 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-p9.dts
@@ -674,7 +674,7 @@
 	status = "okay";
 };
 
-&mipi_dsi_host {
+&dsi {
 	status = "okay";
 
 	dsi_panel: panel@0 {
@@ -682,6 +682,7 @@
 		reg = <0>;
 		backlight = <&backlight>;
 		enable-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
+
 		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>;
 		dsi,format = <MIPI_DSI_FMT_RGB888>;
 		dsi,lanes = <4>;
@@ -689,7 +690,7 @@
 		delay,prepare = <120>;
 		delay,enable = <200>;
 
-		disp_timings: display-timings {
+		display-timings {
 			native-mode = <&timing0>;
 
 			timing0: timing0 {
@@ -715,7 +716,7 @@
 	status = "okay";
 };
 
-&route_mipi {
+&route_dsi {
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
index 8f7a3d90a250..649c475e12f9 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
+++ b/arch/arm64/boot/dts/rockchip/rk3368-sheep.dts
@@ -585,7 +585,7 @@
 	status = "okay";
 };
 
-&mipi_dsi_host {
+&dsi {
 	status = "okay";
 
 	dsi_panel: panel@0 {
@@ -593,13 +593,14 @@
 		reg = <0>;
 		backlight = <&backlight>;
 		enable-gpios = <&gpio0 22 GPIO_ACTIVE_HIGH>;
+
 		dsi,flags = <(MIPI_DSI_MODE_VIDEO | MIPI_DSI_MODE_VIDEO_BURST)>;
 		dsi,format = <MIPI_DSI_FMT_RGB888>;
 		dsi,lanes = <4>;
+
 		delay,prepare = <120>;
-		status = "okay";
 
-		disp_timings: display-timings {
+		display-timings {
 			native-mode = <&timing0>;
 
 			timing0: timing0 {
@@ -626,7 +627,7 @@
 	status = "okay";
 };
 
-&route_mipi {
+&route_dsi {
 	status = "okay";
 };
 
diff --git a/arch/arm64/boot/dts/rockchip/rk3368.dtsi b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
index 76bfed57a998..943b3013e03c 100644
--- a/arch/arm64/boot/dts/rockchip/rk3368.dtsi
+++ b/arch/arm64/boot/dts/rockchip/rk3368.dtsi
@@ -1381,9 +1381,9 @@
 			#address-cells = <1>;
 			#size-cells = <0>;
 
-			vop_out_mipi: endpoint@0 {
+			vop_out_dsi: endpoint@0 {
 				reg = <0>;
-				remote-endpoint = <&mipi_in_vop>;
+				remote-endpoint = <&dsi_in_vop>;
 			};
 
 			vop_out_edp: endpoint@1 {
@@ -1421,7 +1421,7 @@
 		status = "disabled";
 	};
 
-	mipi_dsi_host: mipi-dsi-host@ff960000 {
+	dsi: dsi@ff960000 {
 		compatible = "rockchip,rk3368-mipi-dsi";
 		reg = <0x0 0xff960000 0x0 0x4000>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1439,8 +1439,8 @@
 
 		ports {
 			port {
-				mipi_in_vop: endpoint {
-					remote-endpoint = <&vop_out_mipi>;
+				dsi_in_vop: endpoint {
+					remote-endpoint = <&vop_out_dsi>;
 				};
 			};
 		};