ARM: dts: msm: Add audio overlay for yupik

Add audio overlay for yupik idp and atp platforms.

Change-Id: Ia2e01cdb68a37f6ba33cc20b1856b1e22b251151
This commit is contained in:
Vatsal Bucha 2020-12-30 10:17:11 +05:30
commit 583c0028b6
4 changed files with 115 additions and 4 deletions

View file

@ -2,6 +2,7 @@
#include <dt-bindings/regulator/qcom,rpmh-regulator-levels.h>
#include "yupik-pmic-overlay.dtsi"
#include "pm8350b.dtsi"
#include "yupik-audio-overlay.dtsi"
&soc {
gpio_keys {
@ -222,3 +223,113 @@
status = "ok"
};
&wsa883x_0221 {
status = "disabled";
};
&swr2 {
qcom,swr-phy-dev-addr = <0x0D 0x01170223>,
<0x08 0x58350223>,
<0x08 0x58350222>,
<0x08 0x58350221>,
<0x08 0x58350220>;
};
&wcd938x_rx_slave {
status = "okay";
};
&wcd938x_tx_slave {
status = "okay";
};
&wcd938x_codec {
status = "okay";
};
&wcd937x_codec {
status = "disabled";
};
&wcd937x_rx_slave {
status = "disabled";
};
&wcd937x_tx_slave {
status = "disabled";
};
&swr_haptics {
status = "okay";
};
&yupik_snd {
qcom,model = "lahaina-yupikqrd-snd-card";
qcom,audio-routing =
"AMIC1", "Analog Mic1",
"Analog Mic1", "MIC BIAS1",
"AMIC2", "Analog Mic2",
"Analog Mic2", "MIC BIAS2",
"AMIC3", "Analog Mic3",
"Analog Mic3", "MIC BIAS3",
"AMIC4", "Analog Mic4",
"Analog Mic4", "MIC BIAS1",
"TX DMIC0", "Digital Mic0",
"Digital Mic0", "MIC BIAS1",
"TX DMIC1", "Digital Mic1",
"Digital Mic1", "MIC BIAS1",
"TX DMIC2", "Digital Mic2",
"Digital Mic2", "MIC BIAS3",
"TX DMIC3", "Digital Mic3",
"Digital Mic3", "MIC BIAS3",
"TX DMIC4", "Digital Mic4",
"Digital Mic4", "MIC BIAS4",
"TX DMIC5", "Digital Mic5",
"Digital Mic5", "MIC BIAS4",
"IN1_HPHL", "HPHL_OUT",
"IN2_HPHR", "HPHR_OUT",
"IN3_AUX", "AUX_OUT",
"HAP_IN", "PCM_OUT",
"WSA SRC0_INP", "SRC0",
"WSA_TX DEC0_INP", "TX DEC0 MUX",
"WSA_TX DEC1_INP", "TX DEC1 MUX",
"RX_TX DEC0_INP", "TX DEC0 MUX",
"RX_TX DEC1_INP", "TX DEC1 MUX",
"RX_TX DEC2_INP", "TX DEC2 MUX",
"RX_TX DEC3_INP", "TX DEC3 MUX",
"SpkrRight IN", "WSA_SPK2 OUT",
"TX SWR_INPUT", "WCD_TX_OUTPUT",
"VA SWR_INPUT", "VA_SWR_CLK",
"VA SWR_INPUT", "WCD_TX_OUTPUT",
"VA_AIF1 CAP", "VA_SWR_CLK",
"VA_AIF2 CAP", "VA_SWR_CLK",
"VA_AIF3 CAP", "VA_SWR_CLK",
"VA DMIC0", "Digital Mic0",
"VA DMIC1", "Digital Mic1",
"VA DMIC2", "Digital Mic2",
"VA DMIC3", "Digital Mic3",
"VA DMIC4", "Digital Mic4",
"VA DMIC5", "Digital Mic5",
"VA DMIC0", "VA MIC BIAS1",
"VA DMIC1", "VA MIC BIAS3",
"VA DMIC2", "VA MIC BIAS4",
"VA DMIC3", "VA MIC BIAS1",
"VA DMIC4", "VA MIC BIAS3",
"VA DMIC5", "VA MIC BIAS4";
qcom,swr-dmic-max-devs = <0>;
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
asoc-codec = <&stub_codec>, <&bolero>,
<&wcd938x_codec>, <&swr_haptics>,
<&wsa883x_0222>;
asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
"wcd938x_codec", "swr-haptics",
"wsa-codec2";
qcom,wsa-max-devs = <1>;
qcom,msm_audio_ssr_devs = <&audio_apr>, <&q6core>, <&lpi_tlmm>,
<&bolero>;
};

View file

@ -121,7 +121,6 @@
status = "disabled";
compatible = "qcom,pm8350b-swr-haptics";
reg = <0x01 0xf0170220>;
swr-slave-supply = <&hap_swr_slave_reg>;
qcom,rx_swr_ch_map = <0 0x01 0x01 0 PCM_OUT1>;
};
@ -367,10 +366,10 @@
qcom,cdc-dmic23-gpios = <&cdc_dmic23_gpios>;
qcom,cdc-dmic45-gpios = <&cdc_dmic45_gpios>;
asoc-codec = <&stub_codec>, <&bolero>,
<&wcd937x_codec>, <&swr_haptics>,
<&wcd937x_codec>,
<&wsa883x_0221>, <&wsa883x_0222>;
asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
"wcd937x_codec", "swr-haptics",
"wcd937x_codec",
"wsa-codec1", "wsa-codec2";
qcom,wsa-max-devs = <2>;
qcom,cps_reg_phy_addr = <0x3250300 0x3250304 0x3250318>;

View file

@ -3,6 +3,7 @@
#include <dt-bindings/iio/qcom,spmi-adc7-smb139x.h>
#include "yupik-pmic-overlay.dtsi"
#include "pm7325b.dtsi"
#include "yupik-audio-overlay.dtsi"
&soc {
gpio_keys {

View file

@ -317,7 +317,7 @@
swr-slave-supply = <&hap_swr_slave_reg>;
};
&tx_macro {
&swr2 {
qcom,swr-phy-dev-addr = <0x0D 0x01170223>,
<0x08 0x58350223>,
<0x08 0x58350222>,