Evolution-x-devices/kernel_oneplus_sm8550-devicetrees
2
0
Fork 0
mirror of https://github.com/Evolution-X-Devices/kernel_oneplus_sm8550-devicetrees synced 2026-02-01 09:49:52 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge "audio-devicetree: AUX PCM TX and RX separation"

Browse Source
This commit is contained in:
qctecmdr
2022-08-30 10:51:29 -07:00
committed by Gerrit - the friendly Code Review server
parent b72a5c4450 ce3d955e7c
commit 5e0e88f617
2 changed files with 89 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

92
msm-auto-audio-lpass.dtsi
View File

@@ -405,7 +405,7 @@
};
};
dai_pri_auxpcm: qcom,msm-pri-auxpcm {
dai_pri_auxpcm_rx: qcom,msm-pri-auxpcm_rx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
@@ -433,7 +433,7 @@
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_sec_auxpcm: qcom,msm-sec-auxpcm {
dai_sec_auxpcm_rx: qcom,msm-sec-auxpcm_rx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
@@ -443,11 +443,11 @@
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "secondary";
qcom,msm-auxpcm-interface = "secondaryRx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_tert_auxpcm: qcom,msm-tert-auxpcm {
dai_sec_auxpcm_tx: qcom,msm-sec-auxpcm_tx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
@@ -457,11 +457,11 @@
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "tertiary";
qcom,msm-auxpcm-interface = "secondaryTx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_quat_auxpcm: qcom,msm-quat-auxpcm {
dai_tert_auxpcm_rx: qcom,msm-tert-auxpcm_rx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
@@ -471,11 +471,11 @@
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "quaternary";
qcom,msm-auxpcm-interface = "tertiaryRx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_quin_auxpcm: qcom,msm-quin-auxpcm {
dai_tert_auxpcm_tx: qcom,msm-tert-auxpcm_tx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
@@ -485,11 +485,11 @@
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "quinary";
qcom,msm-auxpcm-interface = "tertiaryTx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_sen_auxpcm: qcom,msm-sen-auxpcm {
dai_quat_auxpcm_rx: qcom,msm-quat-auxpcm_rx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
@@ -499,7 +499,77 @@
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "senary";
qcom,msm-auxpcm-interface = "quaternaryRx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_quat_auxpcm_tx: qcom,msm-quat-auxpcm_tx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "quaternaryTx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_quin_auxpcm_rx: qcom,msm-quin-auxpcm_rx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "quinaryRx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_quin_auxpcm_tx: qcom,msm-quin-auxpcm_tx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "quinaryTx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_sen_auxpcm_rx: qcom,msm-sen-auxpcm_rx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "senaryRx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};
dai_sen_auxpcm_tx: qcom,msm-sen-auxpcm_tx {
compatible = "qcom,msm-auxpcm-dev";
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
qcom,msm-cpudai-auxpcm-frame = <5>, <4>;
qcom,msm-cpudai-auxpcm-quant = <2>, <2>;
qcom,msm-cpudai-auxpcm-num-slots = <1>, <1>;
qcom,msm-cpudai-auxpcm-slot-mapping = <1>, <1>;
qcom,msm-cpudai-auxpcm-data = <0>, <0>;
qcom,msm-cpudai-auxpcm-pcm-clk-rate = <2048000>, <2048000>;
qcom,msm-auxpcm-interface = "senaryTx";
qcom,msm-cpudai-afe-clk-ver = <2>;
};

12
sa8155-audio.dtsi
View File

@@ -452,7 +452,7 @@
};
};
&dai_pri_auxpcm{
&dai_pri_auxpcm_rx{
pinctrl-names = "default", "sleep";
pinctrl-0 = <&pri_aux_pcm_clk_active &pri_aux_pcm_sync_active
&pri_aux_pcm_din_active &pri_aux_pcm_dout_active>;
@@ -512,9 +512,11 @@
<&dai_mi2s2_rx>, <&dai_mi2s2_tx>,
<&dai_mi2s3_rx>, <&dai_mi2s3_tx>,
<&dai_mi2s4_rx>, <&dai_mi2s4_tx>,
<&dai_pri_auxpcm>, <&dai_pri_auxpcm_tx>,
<&dai_sec_auxpcm>, <&dai_tert_auxpcm>,
<&dai_quat_auxpcm>, <&dai_quin_auxpcm>,
<&dai_pri_auxpcm_rx>, <&dai_pri_auxpcm_tx>,
<&dai_sec_auxpcm_rx>, <&dai_sec_auxpcm_tx>,
<&dai_tert_auxpcm_rx>, <&dai_tert_auxpcm_tx>,
<&dai_quat_auxpcm_rx>, <&dai_quat_auxpcm_tx>,
<&dai_quin_auxpcm_rx>, <&dai_quin_auxpcm_tx>,
<&afe_pcm_rx>, <&afe_pcm_tx>,
<&afe_proxy_rx>, <&afe_proxy_tx>,
<&afe_pcm_rx_1>, <&afe_proxy_tx_1>,
@@ -554,6 +556,8 @@
"msm-dai-q6-auxpcm.1","msm-dai-q6-auxpcm.2",
"msm-dai-q6-auxpcm.3", "msm-dai-q6-auxpcm.4",
"msm-dai-q6-auxpcm.5", "msm-dai-q6-auxpcm.6",
"msm-dai-q6-auxpcm.7", "msm-dai-q6-auxpcm.8",
"msm-dai-q6-auxpcm.9", "msm-dai-q6-auxpcm.10",
"msm-dai-q6-dev.224", "msm-dai-q6-dev.225",
"msm-dai-q6-dev.241", "msm-dai-q6-dev.240",
"msm-dai-q6-dev.226", "msm-dai-q6-dev.242",