From: xubilv <xbl@rock-chips.com>
Date: Thu, 13 Jul 2017 09:04:54 +0000 (+0800)
Subject: ARM: dts: rk3288: rename mipi to dsi
X-Git-Tag: release-20171130_firefly~4^2~170
X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=2d1c413b968b88d1df53def7265cb9c6a96939e6;p=firefly-linux-kernel-4.4.55.git

ARM: dts: rk3288: rename mipi to dsi

Change-Id: I35d348068df3720608fc9cd22f97be0264a03f67
Signed-off-by: xubilv <xbl@rock-chips.com>
---

diff --git a/arch/arm/boot/dts/rk3288-android.dtsi b/arch/arm/boot/dts/rk3288-android.dtsi
index 787368b32190..a8ebc9780e81 100644
--- a/arch/arm/boot/dts/rk3288-android.dtsi
+++ b/arch/arm/boot/dts/rk3288-android.dtsi
@@ -206,13 +206,13 @@
 				connect = <&vopb_out_edp>;
 			};
 
-			route_mipi: route-mipi {
+			route_dsi0: route-dsi0 {
 				status = "disabled";
 				logo,uboot = "logo.bmp";
 				logo,kernel = "logo_kernel.bmp";
 				logo,mode = "center";
 				charge_logo,mode = "center";
-				connect = <&vopb_out_mipi>;
+				connect = <&vopb_out_dsi0>;
 			};
 		};
 	};
@@ -389,10 +389,10 @@
 	status = "okay";
 };
 
-&mipi_dsi {
+&dsi0 {
 	ports {
-		mipi_in: port {
-			mipi_in_vopl: endpoint@1 {
+		dsi0_in: port {
+			dsi0_in_vopl: endpoint@1 {
 				status = "disabled";
 			};
 		};
diff --git a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts
index 24c916d0ff5c..c5cb86ebb27c 100644
--- a/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts
+++ b/arch/arm/boot/dts/rk3288-evb-android-rk818-mipi.dts
@@ -332,7 +332,7 @@
 	power-supply = <&vcc_lcd>;
 };
 
-&mipi_dsi {
+&dsi0 {
 	status = "okay";
 
 	panel: panel {
@@ -370,7 +370,7 @@
 	};
 };
 
-&route_mipi {
+&route_dsi0 {
 	status = "okay";
 };
 
diff --git a/arch/arm/boot/dts/rk3288.dtsi b/arch/arm/boot/dts/rk3288.dtsi
index 945992810932..200e988d1416 100644
--- a/arch/arm/boot/dts/rk3288.dtsi
+++ b/arch/arm/boot/dts/rk3288.dtsi
@@ -1201,9 +1201,9 @@
 				remote-endpoint = <&edp_in_vopb>;
 			};
 
-			vopb_out_mipi: endpoint@2 {
+			vopb_out_dsi0: endpoint@2 {
 				reg = <2>;
-				remote-endpoint = <&mipi_in_vopb>;
+				remote-endpoint = <&dsi0_in_vopb>;
 			};
 
 			vopb_out_lvds: endpoint@3 {
@@ -1251,9 +1251,9 @@
 				remote-endpoint = <&edp_in_vopl>;
 			};
 
-			vopl_out_mipi: endpoint@2 {
+			vopl_out_dsi0: endpoint@2 {
 				reg = <2>;
-				remote-endpoint = <&mipi_in_vopl>;
+				remote-endpoint = <&dsi0_in_vopl>;
 			};
 
 			vopl_out_lvds: endpoint@3 {
@@ -1276,7 +1276,7 @@
 		status = "disabled";
 	};
 
-	mipi_dsi: mipi@ff960000 {
+	dsi0: dsi@ff960000 {
 		compatible = "rockchip,rk3288-mipi-dsi", "snps,dw-mipi-dsi";
 		reg = <0x0 0xff960000 0x0 0x4000>;
 		interrupts = <GIC_SPI 19 IRQ_TYPE_LEVEL_HIGH>;
@@ -1289,16 +1289,16 @@
 		status = "disabled";
 
 		ports {
-			mipi_in: port {
+			dsi0_in: port {
 				#address-cells = <1>;
 				#size-cells = <0>;
-				mipi_in_vopb: endpoint@0 {
+				dsi0_in_vopb: endpoint@0 {
 					reg = <0>;
-					remote-endpoint = <&vopb_out_mipi>;
+					remote-endpoint = <&vopb_out_dsi0>;
 				};
-				mipi_in_vopl: endpoint@1 {
+				dsi0_in_vopl: endpoint@1 {
 					reg = <1>;
-					remote-endpoint = <&vopl_out_mipi>;
+					remote-endpoint = <&vopl_out_dsi0>;
 				};
 			};
 		};