Merge "ARM: dts: msm: Update mi2s group port id for msm8996"

7 files changed, 42 insertions, 42 deletions

diff --git a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
index e42c348aad26..102857a13a86 100644
--- a/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
+++ b/Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
@@ -2703,12 +2703,12 @@ Required properties:
 				The size of the array is determined by
 				the value in msm-cpudai-mi2s-group-num-ports.
 				Each group supports up to 4 ports:
-				Secondary RX: 	4160, 4162, 4164, 4174,
-				Secondary TX:	4161, 4163, 4165, 4175,
-				Tertiary RX: 	4168, 4170, 4172, 4176,
-				Tertiary TX: 	4169, 4171, 4173, 4177,
-				Quaternary RX:	4102, 4128, 4130, 4132,
-				Quaternary TX:	4103, 4129, 4131, 4133,
+				Secondary RX: 	4160, 4162, 4164, 4166,
+				Secondary TX:	4161, 4163, 4165, 4167,
+				Tertiary RX: 	4168, 4170, 4172, 4174,
+				Tertiary TX: 	4169, 4171, 4173, 4175,
+				Quaternary RX:	4128, 4130, 4132, 4134,
+				Quaternary TX:	4129, 4131, 4133, 4135,
 
  - qcom,msm-cpudai-mi2s-channel-mode: group mi2s line channel mode.
 				I2S_SD0    :                  0x1
diff --git a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
index 1a9a24cec1ba..f484eea9f01a 100644
--- a/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
+++ b/arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
@@ -767,13 +767,13 @@
 				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
 				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
 				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
-				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
+				"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
 				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
-				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
+				"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
 				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
-				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
+				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
 				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
-				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
+				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
 				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
 				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
 				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",
diff --git a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
index 20b5103496c5..db99055e095f 100644
--- a/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
@@ -1144,13 +1144,13 @@
 				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
 				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
 				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
-				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
+				"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
 				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
-				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
+				"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
 				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
-				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
+				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
 				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
-				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
+				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
 				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
 				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
 				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",
diff --git a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
index fd0b1dd58a3f..b0ff859d560f 100644
--- a/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
@@ -997,13 +997,13 @@
 				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
 				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
 				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
-				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
+				"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
 				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
-				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
+				"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
 				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
-				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
+				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
 				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
-				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
+				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
 				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
 				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
 				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",
diff --git a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
index 085f94d7f5b3..4367a876a64d 100644
--- a/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
@@ -592,13 +592,13 @@
 				"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
 				"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
 				"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
-				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
+				"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
 				"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
-				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
+				"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
 				"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
-				"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
+				"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
 				"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
-				"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
+				"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
 				"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
 				"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
 				"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",
diff --git a/arch/arm/boot/dts/qcom/msm8996.dtsi b/arch/arm/boot/dts/qcom/msm8996.dtsi
index 6e2d9a8bf1fc..aa1d28a082a8 100644
--- a/arch/arm/boot/dts/qcom/msm8996.dtsi
+++ b/arch/arm/boot/dts/qcom/msm8996.dtsi
@@ -3564,7 +3564,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4354>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4160 4162 4164 4174>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4160 4162 4164 4166>;
 		qcom,msm-cpudai-mi2s-channel-mode = <2>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <12288000>;
@@ -3592,7 +3592,7 @@
 
 		dai_sec_mi2s_rx_4:qcom,msm-dai-q6-mi2s-sec-rx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4174>;
+			qcom,msm-cpudai-mi2s-dev-id = <4166>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <2>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};
@@ -3602,7 +3602,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4355>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4161 4163 4165 4175>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4161 4163 4165 4167>;
 		qcom,msm-cpudai-mi2s-channel-mode = <1>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <12288000>;
@@ -3630,7 +3630,7 @@
 
 		dai_sec_mi2s_tx_4:qcom,msm-dai-q6-mi2s-sec-tx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4175>;
+			qcom,msm-cpudai-mi2s-dev-id = <4167>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <1>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};
@@ -3640,7 +3640,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4356>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4168 4170 4172 4176>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4168 4170 4172 4174>;
 		qcom,msm-cpudai-mi2s-channel-mode = <5>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <3072000>;
@@ -3668,7 +3668,7 @@
 
 		dai_tert_mi2s_rx_4:qcom,msm-dai-q6-mi2s-tert-rx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4176>;
+			qcom,msm-cpudai-mi2s-dev-id = <4174>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <2>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};
@@ -3678,7 +3678,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4357>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4169 4171 4173 4177>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4169 4171 4173 4175>;
 		qcom,msm-cpudai-mi2s-channel-mode = <5>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <3072000>;
@@ -3706,7 +3706,7 @@
 
 		dai_tert_mi2s_tx_4:qcom,msm-dai-q6-mi2s-tert-tx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4177>;
+			qcom,msm-cpudai-mi2s-dev-id = <4175>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <2>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};
diff --git a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi
index 9026474e40e3..1aec20a24824 100644
--- a/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi
+++ b/arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi
@@ -86,13 +86,13 @@
 			"msm-dai-q6-tdm.36915", "msm-dai-q6-tdm.36917",
 			"msm-dai-q6-tdm.36919", "msm-dai-q6-mi2s.4160",
 			"msm-dai-q6-mi2s.4162", "msm-dai-q6-mi2s.4164",
-			"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4161",
+			"msm-dai-q6-mi2s.4166", "msm-dai-q6-mi2s.4161",
 			"msm-dai-q6-mi2s.4163", "msm-dai-q6-mi2s.4165",
-			"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4168",
+			"msm-dai-q6-mi2s.4167", "msm-dai-q6-mi2s.4168",
 			"msm-dai-q6-mi2s.4170", "msm-dai-q6-mi2s.4172",
-			"msm-dai-q6-mi2s.4176", "msm-dai-q6-mi2s.4169",
+			"msm-dai-q6-mi2s.4174", "msm-dai-q6-mi2s.4169",
 			"msm-dai-q6-mi2s.4171", "msm-dai-q6-mi2s.4173",
-			"msm-dai-q6-mi2s.4177", "msm-dai-q6-mi2s.4128",
+			"msm-dai-q6-mi2s.4175", "msm-dai-q6-mi2s.4128",
 			"msm-dai-q6-mi2s.4130", "msm-dai-q6-mi2s.4132",
 			"msm-dai-q6-mi2s.4134", "msm-dai-q6-mi2s.4129",
 			"msm-dai-q6-mi2s.4131", "msm-dai-q6-mi2s.4133",
@@ -277,7 +277,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4354>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4160 4162 4164 4174>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4160 4162 4164 4166>;
 		qcom,msm-cpudai-mi2s-channel-mode = <2>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <12288000>;
@@ -305,7 +305,7 @@
 
 		dai_sec_mi2s_rx_4:qcom,msm-dai-q6-mi2s-sec-rx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4174>;
+			qcom,msm-cpudai-mi2s-dev-id = <4166>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <2>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};
@@ -315,7 +315,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4355>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4161 4163 4165 4175>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4161 4163 4165 4167>;
 		qcom,msm-cpudai-mi2s-channel-mode = <1>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <12288000>;
@@ -343,7 +343,7 @@
 
 		dai_sec_mi2s_tx_4:qcom,msm-dai-q6-mi2s-sec-tx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4175>;
+			qcom,msm-cpudai-mi2s-dev-id = <4167>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <1>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};
@@ -353,7 +353,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4356>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4168 4170 4172 4176>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4168 4170 4172 4174>;
 		qcom,msm-cpudai-mi2s-channel-mode = <5>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <3072000>;
@@ -381,7 +381,7 @@
 
 		dai_tert_mi2s_rx_4:qcom,msm-dai-q6-mi2s-tert-rx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4176>;
+			qcom,msm-cpudai-mi2s-dev-id = <4174>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <2>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};
@@ -391,7 +391,7 @@
 		compatible = "qcom,msm-dai-group-mi2s";
 		qcom,msm-cpudai-mi2s-group-id = <4357>;
 		qcom,msm-cpudai-mi2s-group-num-ports = <4>;
-		qcom,msm-cpudai-mi2s-group-port-id = <4169 4171 4173 4177>;
+		qcom,msm-cpudai-mi2s-group-port-id = <4169 4171 4173 4175>;
 		qcom,msm-cpudai-mi2s-channel-mode = <5>;
 		qcom,msm-cpudai-mi2s-sync-mode = <1>;
 		qcom,msm-cpudai-mi2s-mclk = <3072000>;
@@ -419,7 +419,7 @@
 
 		dai_tert_mi2s_tx_4:qcom,msm-dai-q6-mi2s-tert-tx-4 {
 			compatible = "qcom,msm-dai-group-mi2s-dev";
-			qcom,msm-cpudai-mi2s-dev-id = <4177>;
+			qcom,msm-cpudai-mi2s-dev-id = <4175>;
 			qcom,msm-cpudai-mi2s-dev-channel-mode = <2>;
 			qcom,msm-cpudai-mi2s-data-align = <0>;
 		};