evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

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

Browse source 
Revise group afe port id for secondary and tertiary due to adsp
firmware definition change.

Change-Id: I829437bc7ac7ff5159a86f667b7a5b58f36e0c66
Signed-off-by: Cong Tang <congt@codeaurora.org>
This commit is contained in:
Cong Tang 2018-12-17 14:16:49 +08:00 • committed by Gerrit - the friendly Code Review server
parent 082fa7fad6
commit 24c58ec4d0
7 changed files with 42 additions and 42 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
Documentation/devicetree/bindings/sound/qcom-audio-dev.txt
View file

@ -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

8
arch/arm/boot/dts/qcom/apq8096-auto-dragonboard.dtsi
View file

@ -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",

8
arch/arm/boot/dts/qcom/msm8996-agave-adp.dtsi
View file

@ -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",

8
arch/arm/boot/dts/qcom/msm8996-auto-cdp.dtsi
View file

@ -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",

8
arch/arm/boot/dts/qcom/msm8996-mmxf-adp.dtsi
View file

@ -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",

16
arch/arm/boot/dts/qcom/msm8996.dtsi
View file

@ -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>;
};

24
arch/arm/boot/dts/qcom/vplatform-lfv-msm8996-audio-common.dtsi
View file

@ -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>;
};