Merge "msm: mdss: rename dsi phy version for msm8996 and sdm660"

6 files changed, 24 insertions, 24 deletions

diff --git a/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt b/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
index 0299b1aef2b6..52ffbe5c7207 100644
--- a/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
+++ b/Documentation/devicetree/bindings/fb/mdss-dsi-panel.txt
@@ -37,8 +37,8 @@ Required properties:
 					"display_2" = DISPLAY_2
 - qcom,mdss-dsi-panel-timings:		An array of length 12 that specifies the PHY
 					timing settings for the panel.
-- qcom,mdss-dsi-panel-timings-8996:		An array of length 40 char that specifies the 8996 PHY lane
-					timing settings for the panel.
+- qcom,mdss-dsi-panel-timings-phy-v2:	An array of length 40 char that specifies the PHY version 2
+					lane timing settings for the panel.
 - qcom,mdss-dsi-on-command:		A byte stream formed by multiple dcs packets base on
 					qcom dsi controller protocol.
 					byte 0: dcs data type
@@ -638,7 +638,7 @@ Example:
 		qcom,mdss-mdp-transfer-time-us = <12500>;
 		qcom,mdss-dsi-panel-timings = [7d 25 1d 00 37 33
 					22 27 1e 03 04 00];
-                qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
+                qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
                                 23 20 06 09 05 03 04 a0
                                 23 20 06 09 05 03 04 a0
                                 23 20 06 09 05 03 04 a0
diff --git a/arch/arm/boot/dts/qcom/dsi-adv7533-1080p.dtsi b/arch/arm/boot/dts/qcom/dsi-adv7533-1080p.dtsi
index d67922a865fb..7994285f13f1 100644
--- a/arch/arm/boot/dts/qcom/dsi-adv7533-1080p.dtsi
+++ b/arch/arm/boot/dts/qcom/dsi-adv7533-1080p.dtsi
@@ -64,7 +64,7 @@
 		qcom,mdss-pan-physical-height-dimension = <90>;
 		qcom,mdss-dsi-force-clock-lane-hs;
 		qcom,mdss-dsi-always-on;
-		qcom,mdss-dsi-panel-timings-8996 = [1d 1a 03 05 01 03 04 a0
+		qcom,mdss-dsi-panel-timings-phy-v2 = [1d 1a 03 05 01 03 04 a0
 			1d 1a 03 05 01 03 04 a0
 			1d 1a 03 05 01 03 04 a0
 			1d 1a 03 05 01 03 04 a0
diff --git a/arch/arm/boot/dts/qcom/dsi-adv7533-720p.dtsi b/arch/arm/boot/dts/qcom/dsi-adv7533-720p.dtsi
index f6a42b430b58..b84488c0cef3 100644
--- a/arch/arm/boot/dts/qcom/dsi-adv7533-720p.dtsi
+++ b/arch/arm/boot/dts/qcom/dsi-adv7533-720p.dtsi
@@ -63,7 +63,7 @@ dsi_adv7533_720p: qcom,mdss_dsi_adv7533_720p {
 		qcom,mdss-pan-physical-height-dimension = <90>;
 		qcom,mdss-dsi-force-clock-lane-hs;
 		qcom,mdss-dsi-always-on;
-		qcom,mdss-dsi-panel-timings-8996 = [1c 19 02 03 01 03 04 a0
+		qcom,mdss-dsi-panel-timings-phy-v2 = [1c 19 02 03 01 03 04 a0
 			1c 19 02 03 01 03 04 a0
 			1c 19 02 03 01 03 04 a0
 			1c 19 02 03 01 03 04 a0
diff --git a/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi b/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
index e62c7fbcc1af..bfb85274846f 100644
--- a/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-mdss-panels.dtsi
@@ -131,7 +131,7 @@
 };
 
 &dsi_nt35950_4k_dsc_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [21 1e 06 08 04 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
@@ -139,7 +139,7 @@
 };
 
 &dsi_sharp_4k_dsc_video {
-	qcom,mdss-dsi-panel-timings-8996 = [21 1e 06 08 04 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
@@ -147,7 +147,7 @@
 };
 
 &dsi_sharp_4k_dsc_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [21 1e 06 08 04 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
 		21 1e 06 08 04 03 04 a0
@@ -155,7 +155,7 @@
 };
 
 &dsi_dual_sharp_video {
-	qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
 			23 20 06 09 05 03 04 a0
 			23 20 06 09 05 03 04 a0
 			23 20 06 09 05 03 04 a0
@@ -163,7 +163,7 @@
 };
 
 &dsi_dual_jdi_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [22 1e 06 08 04 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [22 1e 06 08 04 03 04 a0
 			22 1e 06 08 04 03 04 a0
 			22 1e 06 08 04 03 04 a0
 			22 1e 06 08 04 03 04 a0
@@ -173,7 +173,7 @@
 };
 
 &dsi_dual_jdi_video {
-	qcom,mdss-dsi-panel-timings-8996 = [22 1e 06 08 04 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [22 1e 06 08 04 03 04 a0
 			22 1e 06 08 04 03 04 a0
 			22 1e 06 08 04 03 04 a0
 			22 1e 06 08 04 03 04 a0
@@ -181,7 +181,7 @@
 };
 
 &dsi_dual_sharp_1080_120hz_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [23 1e 07 08 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 1e 07 08 05 03 04 a0
 			23 1e 07 08 05 03 04 a0
 			23 1e 07 08 05 03 04 a0
 			23 1e 07 08 05 03 04 a0
@@ -189,7 +189,7 @@
 };
 
 &dsi_dual_nt35597_video {
-	qcom,mdss-dsi-panel-timings-8996 = [23 1e 07 08 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
@@ -199,7 +199,7 @@
 };
 
 &dsi_dual_nt35597_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [23 1e 07 08 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
@@ -209,7 +209,7 @@
 };
 
 &dsi_nt35597_dsc_video {
-	qcom,mdss-dsi-panel-timings-8996 = [20 1d 05 07 03 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [20 1d 05 07 03 03 04 a0
 		20 1d 05 07 03 03 04 a0
 		20 1d 05 07 03 03 04 a0
 		20 1d 05 07 03 03 04 a0
@@ -219,7 +219,7 @@
 };
 
 &dsi_nt35597_dsc_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [20 1d 05 07 03 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [20 1d 05 07 03 03 04 a0
 		20 1d 05 07 03 03 04 a0
 		20 1d 05 07 03 03 04 a0
 		20 1d 05 07 03 03 04 a0
@@ -229,7 +229,7 @@
 };
 
 &dsi_dual_jdi_4k_nofbc_video {
-	qcom,mdss-dsi-panel-timings-8996 = [
+	qcom,mdss-dsi-panel-timings-phy-v2 = [
 		2c 27 0e 10 0a 03 04 a0
 		2c 27 0e 10 0a 03 04 a0
 		2c 27 0e 10 0a 03 04 a0
@@ -238,14 +238,14 @@
 };
 
 &dsi_hx8379a_fwvga_truly_vid {
-	qcom,mdss-dsi-panel-timings-8996 = [23 20 06 09 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 20 06 09 05 03 04 a0
 		23 20 06 09 05 03 04 a0
 		23 20 06 09 05 03 04 a0
 		23 20 06 09 05 03 04 a0
 		23 2e 06 08 05 03 04 a0];
 };
 &dsi_r69007_wqxga_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [23 1f 07 09 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 1f 07 09 05 03 04 a0
 		23 1f 07 09 05 03 04 a0
 		23 1f 07 09 05 03 04 a0
 		23 1f 07 09 05 03 04 a0
@@ -253,7 +253,7 @@
 };
 
 &dsi_sharp_1080_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [23 1f 07 09 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 1f 07 09 05 03 04 a0
 		23 1f 07 09 05 03 04 a0
 		23 1f 07 09 05 03 04 a0
 		23 1f 07 09 05 03 04 a0
diff --git a/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi b/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi
index 28e5f6ba8b45..84a99be7371e 100644
--- a/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi
+++ b/arch/arm/boot/dts/qcom/sdm660-mdss-panels.dtsi
@@ -67,7 +67,7 @@
 };
 
 &dsi_dual_nt35597_truly_video {
-	qcom,mdss-dsi-panel-timings-8996 = [23 1e 07 08 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
@@ -75,7 +75,7 @@
 };
 
 &dsi_dual_nt35597_truly_cmd {
-	qcom,mdss-dsi-panel-timings-8996 = [23 1e 07 08 05 03 04 a0
+	qcom,mdss-dsi-panel-timings-phy-v2 = [23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
 		23 1e 07 08 05 03 04 a0
diff --git a/drivers/video/fbdev/msm/mdss_dsi_panel.c b/drivers/video/fbdev/msm/mdss_dsi_panel.c
index 79e74df12988..29288f0bca74 100644
--- a/drivers/video/fbdev/msm/mdss_dsi_panel.c
+++ b/drivers/video/fbdev/msm/mdss_dsi_panel.c
@@ -2366,9 +2366,9 @@ static int mdss_dsi_panel_timing_from_dt(struct device_node *np,
 		phy_timings_present = true;
 	}
 
-	data = of_get_property(np, "qcom,mdss-dsi-panel-timings-8996", &len);
+	data = of_get_property(np, "qcom,mdss-dsi-panel-timings-phy-v2", &len);
 	if ((!data) || (len != 40)) {
-		pr_debug("%s:%d, Unable to read 8996 Phy lane timing settings",
+		pr_debug("%s:%d, Unable to read phy-v2 lane timing settings",
 		       __func__, __LINE__);
 	} else {
 		for (i = 0; i < len; i++)