mirror of
https://github.com/Evolution-X-Devices/kernel_oneplus_sm8550-devicetrees
synced 2026-02-01 09:49:52 +00:00
Merge 5e0e88f617 on remote branch
Change-Id: I43a6afe567c2341904ee381b73ecad8c23add660
This commit is contained in:
Linux Build Service Account
@@ -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>;
|
||||
@@ -415,11 +415,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 = "primary";
|
||||
qcom,msm-auxpcm-interface = "primaryRx";
|
||||
qcom,msm-cpudai-afe-clk-ver = <2>;
|
||||
};
|
||||
|
||||
dai_sec_auxpcm: qcom,msm-sec-auxpcm {
|
||||
dai_pri_auxpcm_tx: qcom,msm-pri-auxpcm_tx {
|
||||
compatible = "qcom,msm-auxpcm-dev";
|
||||
qcom,msm-cpudai-auxpcm-mode = <0>, <0>;
|
||||
qcom,msm-cpudai-auxpcm-sync = <1>, <1>;
|
||||
@@ -429,11 +429,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 = "primaryTx";
|
||||
qcom,msm-cpudai-afe-clk-ver = <2>;
|
||||
};
|
||||
|
||||
dai_tert_auxpcm: qcom,msm-tert-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 = "tertiary";
|
||||
qcom,msm-auxpcm-interface = "secondaryRx";
|
||||
qcom,msm-cpudai-afe-clk-ver = <2>;
|
||||
};
|
||||
|
||||
dai_quat_auxpcm: qcom,msm-quat-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 = "quaternary";
|
||||
qcom,msm-auxpcm-interface = "secondaryTx";
|
||||
qcom,msm-cpudai-afe-clk-ver = <2>;
|
||||
};
|
||||
|
||||
dai_quin_auxpcm: qcom,msm-quin-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 = "quinary";
|
||||
qcom,msm-auxpcm-interface = "tertiaryRx";
|
||||
qcom,msm-cpudai-afe-clk-ver = <2>;
|
||||
};
|
||||
|
||||
dai_sen_auxpcm: qcom,msm-sen-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,7 +485,91 @@
|
||||
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 = "tertiaryTx";
|
||||
qcom,msm-cpudai-afe-clk-ver = <2>;
|
||||
};
|
||||
|
||||
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>;
|
||||
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 = "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>;
|
||||
};
|
||||
|
||||
|
||||
@@ -13,6 +13,7 @@
|
||||
model = "Qualcomm Technologies, Inc. SA8155";
|
||||
compatible = "qcom,sa8155";
|
||||
qcom,msm-id = <339 0x10000>, <339 0x20000>, <362 0x10000>,
|
||||
<362 0x20000>, <367 0x10000>, <367 0x20000>;
|
||||
<362 0x20000>, <367 0x10000>, <367 0x20000>,
|
||||
<405 0x20000>;
|
||||
qcom,board-id = <0 0>;
|
||||
};
|
||||
|
||||
@@ -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_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>,
|
||||
@@ -551,9 +553,11 @@
|
||||
"msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.5",
|
||||
"msm-dai-q6-mi2s.6", "msm-dai-q6-mi2s.7",
|
||||
"msm-dai-q6-mi2s.8", "msm-dai-q6-mi2s.9",
|
||||
"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.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",
|
||||
|
||||
Reference in New Issue
Block a user