diff options
| author | qctecmdr <qctecmdr@localhost> | 2021-02-26 04:39:37 -0800 |
|---|---|---|
| committer | Gerrit - the friendly Code Review server <code-review@localhost> | 2021-02-26 04:39:37 -0800 |
| commit | f21f049cfe69af988261a84844b07e3e36feb449 (patch) | |
| tree | 74cb7ae6e22ba86d20924410437ae3db4df4bbca /qcom | |
| parent | b8b16d992dc76c9790bbc6ea451cbd93677b161c (diff) | |
| parent | 5c2e55b5442256c33480423f0184e1df87e73d9c (diff) | |
| download | devicetree-f21f049cfe69af988261a84844b07e3e36feb449.tar.gz | |
Merge "ARM: dts: msm: Audio dtsi changes for QM215"
Diffstat (limited to 'qcom')
| -rw-r--r-- | qcom/msm8917.dtsi | 5 | ||||
| -rw-r--r-- | qcom/qm215-audio.dtsi | 21 | ||||
| -rw-r--r-- | qcom/qm215.dts | 3 |
3 files changed, 14 insertions, 15 deletions
diff --git a/qcom/msm8917.dtsi b/qcom/msm8917.dtsi index e8990291..40bd992f 100644 --- a/qcom/msm8917.dtsi +++ b/qcom/msm8917.dtsi @@ -1210,6 +1210,7 @@ qcom,ipc = <&apcs 0 8>; qcom,smd-edge = <1>; qcom,remote-pid = <2>; + mbox-names = "adsp_smem"; label = "adsp"; qcom,smd-channels = "IPCRTR"; @@ -1225,6 +1226,10 @@ qcom,diag_cntl { qcom,smd-channels = "DIAG_CNTL"; }; + + qcom,apr_tal_rpmsg { + qcom,smd-channels = "apr_audio_svc"; + }; }; wcnss { diff --git a/qcom/qm215-audio.dtsi b/qcom/qm215-audio.dtsi index 05859267..ce76e901 100644 --- a/qcom/qm215-audio.dtsi +++ b/qcom/qm215-audio.dtsi @@ -5,14 +5,8 @@ qcom,smmu-sid-mask = /bits/ 64 <0xf>; }; -&soc { - qcom,msm-audio-apr { - compatible = "qcom,msm-audio-apr"; - msm_audio_apr_dummy { - compatible = "qcom,msm-audio-apr-dummy"; - }; - }; +&soc { qcom,avtimer@c0a300c { compatible = "qcom,avtimer"; reg = <0x0c0a300c 0x4>, @@ -21,6 +15,13 @@ qcom,clk-div = <27>; }; + audio_apr: qcom,msm-audio-apr { + compatible = "qcom,msm-audio-apr"; + q6core: q6core { + compatible = "qcom,q6core-audio"; + }; + }; + int_codec: sound { status = "okay"; compatible = "qcom,msm8952-audio-codec"; @@ -76,8 +77,6 @@ <&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>, <&dai_mi2s3>, <&dai_mi2s4>, <&dai_mi2s5>, - <&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>, - <&sb_3_rx>, <&sb_3_tx>, <&sb_4_rx>, <&sb_4_tx>, <&bt_sco_rx>, <&bt_sco_tx>, <&int_fm_rx>, <&int_fm_tx>, <&afe_pcm_rx>, <&afe_pcm_tx>, @@ -90,10 +89,6 @@ "msm-dai-q6-mi2s.0", "msm-dai-q6-mi2s.1", "msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3", "msm-dai-q6-mi2s.4", "msm-dai-q6-mi2s.6", - "msm-dai-q6-dev.16384", "msmdai-q6-dev.16385", - "msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387", - "msm-dai-q6-dev.16390", "msm-dai-q6-dev.16391", - "msm-dai-q6-dev.16392", "msm-dai-q6-dev.16393", "msm-dai-q6-dev.12288", "msm-dai-q6-dev.12289", "msm-dai-q6-dev.12292", "msm-dai-q6-dev.12293", "msm-dai-q6-dev.224", "msm-dai-q6-dev.225", diff --git a/qcom/qm215.dts b/qcom/qm215.dts index 7d6f0477..e6ddd75b 100644 --- a/qcom/qm215.dts +++ b/qcom/qm215.dts @@ -2,8 +2,7 @@ #include "qm215.dtsi" #include "qm215-pm8916.dtsi" -/* TBD */ -/* #include "qm215-audio.dtsi" */ +#include "qm215-audio.dtsi" / { model = "Qualcomm Technologies, Inc. QM215"; |