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

ARM: dts: msm: add support for secondary MI2S on msm8996 adp/cdp

Browse source 
Update secondary MI2S DAI entry to use SD0 for TX path and SD1
for RX path, and add secondary MI2S DAI in the automotive sound
card entry for msm8996 automotive ADP/CDP platforms.

CRs-fixed: 1087945
Change-Id: I7c29aa605549f54339b108beae39a4e8816ac6dd
Signed-off-by: Honghao Liu <honghaol@codeaurora.org>
This commit is contained in:
Honghao Liu 2016-11-11 12:18:34 -05:00 • committed by Gerrit - the friendly Code Review server
parent 4a6f833be0
commit 437b8ba3b2
4 changed files with 40 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

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

@ -622,7 +622,7 @@
"msm-pcm-afe", "msm-lsm-client", "msm-pcm-afe", "msm-lsm-client",
"msm-pcm-routing", "msm-compr-dsp"; "msm-pcm-routing", "msm-compr-dsp";
asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>, asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
<&dai_mi2s>, <&dai_mi2s_quat>, <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_pcm_rx>, <&afe_pcm_tx>,
<&afe_proxy_rx>, <&afe_proxy_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
<&incall_record_rx>, <&incall_record_tx>, <&incall_record_rx>, <&incall_record_tx>,
@ -636,7 +636,7 @@
<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,
<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>; <&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2", asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
"msm-dai-q6-hdmi.8", "msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
"msm-dai-q6-dev.224", "msm-dai-q6-dev.225", "msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
"msm-dai-q6-dev.241", "msm-dai-q6-dev.240", "msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@ -661,6 +661,16 @@
}; };
qcom,msm-dai-mi2s { qcom,msm-dai-mi2s {
dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
qcom,msm-mi2s-rx-lines = <2>;
qcom,msm-mi2s-tx-lines = <1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active
&sec_mi2s_sd1_active>;
pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep
&sec_mi2s_sd1_sleep>;
};
dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat { dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>; pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

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

@ -605,7 +605,7 @@
"msm-pcm-afe", "msm-lsm-client", "msm-pcm-afe", "msm-lsm-client",
"msm-pcm-routing", "msm-compr-dsp"; "msm-pcm-routing", "msm-compr-dsp";
asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>, asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
<&dai_mi2s>, <&dai_mi2s_quat>, <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_pcm_rx>, <&afe_pcm_tx>,
<&afe_proxy_rx>, <&afe_proxy_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
<&incall_record_rx>, <&incall_record_tx>, <&incall_record_rx>, <&incall_record_tx>,
@ -619,7 +619,7 @@
<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,
<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>; <&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2", asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
"msm-dai-q6-hdmi.8", "msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
"msm-dai-q6-dev.224", "msm-dai-q6-dev.225", "msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
"msm-dai-q6-dev.241", "msm-dai-q6-dev.240", "msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@ -644,6 +644,8 @@
qcom,msm-dai-mi2s { qcom,msm-dai-mi2s {
dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec { dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
qcom,msm-mi2s-rx-lines = <2>;
qcom,msm-mi2s-tx-lines = <1>;
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active
&sec_mi2s_sd1_active>; &sec_mi2s_sd1_active>;

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

@ -617,7 +617,7 @@
"msm-pcm-afe", "msm-lsm-client", "msm-pcm-afe", "msm-lsm-client",
"msm-pcm-routing", "msm-compr-dsp"; "msm-pcm-routing", "msm-compr-dsp";
asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>, asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
<&dai_mi2s>, <&dai_mi2s_quat>, <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_pcm_rx>, <&afe_pcm_tx>,
<&afe_proxy_rx>, <&afe_proxy_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
<&incall_record_rx>, <&incall_record_tx>, <&incall_record_rx>, <&incall_record_tx>,
@ -631,7 +631,7 @@
<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,
<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>; <&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2", asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
"msm-dai-q6-hdmi.8", "msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
"msm-dai-q6-dev.224", "msm-dai-q6-dev.225", "msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
"msm-dai-q6-dev.241", "msm-dai-q6-dev.240", "msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@ -672,6 +672,16 @@
}; };
qcom,msm-dai-mi2s { qcom,msm-dai-mi2s {
dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
qcom,msm-mi2s-rx-lines = <2>;
qcom,msm-mi2s-tx-lines = <1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active
&sec_mi2s_sd1_active>;
pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep
&sec_mi2s_sd1_sleep>;
};
dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat { dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>; pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;

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

@ -531,7 +531,7 @@
"msm-pcm-afe", "msm-lsm-client", "msm-pcm-afe", "msm-lsm-client",
"msm-pcm-routing", "msm-compr-dsp"; "msm-pcm-routing", "msm-compr-dsp";
asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>, asoc-cpu = <&dai_pri_auxpcm>, <&dai_sec_auxpcm>, <&dai_hdmi>,
<&dai_mi2s>, <&dai_mi2s_quat>, <&dai_mi2s_sec>, <&dai_mi2s>, <&dai_mi2s_quat>,
<&afe_pcm_rx>, <&afe_pcm_tx>, <&afe_pcm_rx>, <&afe_pcm_tx>,
<&afe_proxy_rx>, <&afe_proxy_tx>, <&afe_proxy_rx>, <&afe_proxy_tx>,
<&incall_record_rx>, <&incall_record_tx>, <&incall_record_rx>, <&incall_record_tx>,
@ -545,7 +545,7 @@
<&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>, <&dai_quat_tdm_tx_0>, <&dai_quat_tdm_tx_1>,
<&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>; <&dai_quat_tdm_tx_2>, <&dai_quat_tdm_tx_3>;
asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2", asoc-cpu-names = "msm-dai-q6-auxpcm.1", "msm-dai-q6-auxpcm.2",
"msm-dai-q6-hdmi.8", "msm-dai-q6-hdmi.8", "msm-dai-q6-mi2s.1",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
"msm-dai-q6-dev.224", "msm-dai-q6-dev.225", "msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
"msm-dai-q6-dev.241", "msm-dai-q6-dev.240", "msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
@ -564,6 +564,16 @@
}; };
qcom,msm-dai-mi2s { qcom,msm-dai-mi2s {
dai_mi2s_sec: qcom,msm-dai-q6-mi2s-sec {
qcom,msm-mi2s-rx-lines = <2>;
qcom,msm-mi2s-tx-lines = <1>;
pinctrl-names = "default", "sleep";
pinctrl-0 = <&sec_mi2s_active &sec_mi2s_sd0_active
&sec_mi2s_sd1_active>;
pinctrl-1 = <&sec_mi2s_sleep &sec_mi2s_sd0_sleep
&sec_mi2s_sd1_sleep>;
};
dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat { dai_mi2s_quat: qcom,msm-dai-q6-mi2s-quat {
pinctrl-names = "default", "sleep"; pinctrl-names = "default", "sleep";
pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>; pinctrl-0 = <&quat_mi2s_active &quat_mi2s_sd0_active>;