Merge "ARM: dts: qcom: Upadate base dts file for Monaco"

This commit is contained in:
qctecmdr 2021-05-11 15:52:29 -07:00 • committed by Gerrit - the friendly Code Review server
commit 3026e7ed5e
4 changed files with 44 additions and 3 deletions

View file

@ -70,6 +70,7 @@
besbev_codec: besbev-codec {
compatible = "qcom,besbev-codec";
qcom,split-codec = <1>;
qcom,pmic-spmi-node = <&pm5100_cdc>;
qcom,wcd-reset-reg = <0x0000FCDB>;
qcom,foundry-id-reg = <0x000001F2>;
qcom,swr_ch_map = <0 SPKR_L 0x1 0 LO>,
@ -77,6 +78,7 @@
qcom,besbev-slave = <&besbev_rx_slave>;
qcom,speaker-present = <1>;
qcom,comp-support = <0>;
cdc-mic-bias-supply = <&L28A>;
qcom,cdc-mic-bias-voltage = <2904000 2904000>;
@ -135,11 +137,13 @@
"VA DMIC2", "VA MIC BIAS1",
"VA DMIC3", "VA MIC BIAS1";
nvmem-cells = <&adsp_variant>;
nvmem-cell-names = "adsp_variant";
asoc-codec = <&stub_codec>, <&bolero>,
<&besbev_codec>;
asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
"besbev_codec";
qcom,msm_audio_ssr_devs = <&bolero>, <&lpi_tlmm>;
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&bolero>, <&lpi_tlmm>;
};
&soc {

View file

@ -114,6 +114,7 @@
besbev_codec: besbev-codec {
compatible = "qcom,besbev-codec";
qcom,split-codec = <1>;
qcom,pmic-spmi-node = <&pm5100_cdc>;
qcom,wcd-reset-reg = <0x0000FCDB>;
qcom,foundry-id-reg = <0x000001F2>;
qcom,swr_ch_map = <0 SPKR_L 0x1 0 LO>,
@ -121,6 +122,7 @@
qcom,besbev-slave = <&besbev_rx_slave>;
qcom,speaker-present = <1>;
qcom,comp-support = <0>;
cdc-mic-bias-supply = <&L28A>;
qcom,cdc-mic-bias-voltage = <2904000 2904000>;
@ -172,11 +174,13 @@
qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;
qcom,cdc-dmic02-gpios = <&cdc_dmic02_gpios>;
nvmem-cells = <&adsp_variant>;
nvmem-cell-names = "adsp_variant";
asoc-codec = <&stub_codec>, <&bolero>,
<&besbev_codec>;
asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
"besbev_codec";
qcom,msm_audio_ssr_devs = <&bolero>, <&lpi_tlmm>;
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&bolero>, <&lpi_tlmm>;
};
&soc {

View file

@ -156,13 +156,15 @@
qcom,cdc-dmic01-gpios = <&cdc_dmic01_gpios>;
qcom,cdc-dmic02-gpios = <&cdc_dmic02_gpios>;
nvmem-cells = <&adsp_variant>;
nvmem-cell-names = "adsp_variant";
asoc-codec = <&stub_codec>, <&bolero>,
<&wsa883x_0221>;
asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
"wsa-codec1";
qcom,wsa-max-devs = <1>;
qcom,wsa-devs = <&wsa883x_0221>;
qcom,msm_audio_ssr_devs = <&bolero>, <&lpi_tlmm>;
qcom,msm_audio_ssr_devs = <&audio_gpr>, <&bolero>, <&lpi_tlmm>;
};
&soc {

View file

@ -1,3 +1,4 @@
#include <dt-bindings/sound/qcom,gpr.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include <dt-bindings/clock/qcom,rpmcc.h>
#include <dt-bindings/clock/qcom,dispcc-monaco.h>
@ -22,6 +23,8 @@
serial0 = &qupv3_se6_2uart;
hsuart0 = &qupv3_se5_4uart;
sdhc0 = &sdhc_1; /*SDC1 eMMC slot*/
swr0 = &swr0;
swr1 = &swr1;
};
firmware: firmware {};
@ -552,6 +555,10 @@
#size-cells = <1>;
read-only;
ranges;
adsp_variant: adsp_variant@6011 {
reg = <0x6011 0x1>;
bits = <3 1>;
};
};
mem_dump {
@ -964,6 +971,28 @@
0x4400 2>;
};
audio_gpr: qcom,gpr {
compatible = "qcom,gpr";
qcom,glink-channels = "adsp_apps";
qcom,intents = <0x200 20>;
reg = <GPR_DOMAIN_ADSP>;
spf_core {
compatible = "qcom,spf_core";
reg = <GPR_SVC_ADSP_CORE>;
};
audio-pkt {
compatible = "qcom,audio-pkt";
qcom,audiopkt-ch-name = "apr_audio_svc";
reg = <GPR_SVC_MAX>;
};
audio_prm: q6prm {
compatible = "qcom,audio_prm";
reg = <GPR_SVC_ASM>;
};
};
qcom,adsp_glink_ssr {
qcom,glink-channels = "glink_ssr";
qcom,notify-edges = <&glink_modem>;
@ -1197,6 +1226,7 @@
};
};
#include "pm5100.dtsi"
#include "monaco-pinctrl.dtsi"
#include "msm-arm-smmu-monaco.dtsi"
#include "monaco-ion.dtsi"
@ -1204,6 +1234,7 @@
#include "monaco-gdsc.dtsi"
#include "monaco-qupv3.dtsi"
#include "monaco-pm.dtsi"
#include "monaco-audio.dtsi"
&qupv3_se6_2uart {
status = "ok"