duff/android_kernel_motorola_sm6225
1
0 Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

ARM: dts: msm: tasha snd node changes for sdm660

Browse Source 
Enable audio support for sdm660 with wcd9335 codec.

Change-Id: I7d8cc2ee8931a8ae0880b7841dbeaa817ac310ea
This commit is contained in:
Soumya Managoli committed 2020-10-08 16:53:47 +05:30
1 parent ccd582e605
commit 1f583c7836
4 files changed
+72 -30
Download Patch File Download Diff File Expand all files Collapse all files

No files matched your search

qcom/msm-audio.dtsi
+44 -12
View File
@@ -2,6 +2,19 @@
status = "okay";
};
&pm660_gpios {
pmi_clk {
pmi_clk_default: pmi_clk_default {
status = "ok"
pins = "gpio3";
function = "func1";
output-enable;
output-low;
qcom,drive-strength = <2>;
};
};
};
&soc {
pcm0: qcom,msm-pcm {
compatible = "qcom,msm-pcm-dsp";
@@ -661,12 +674,13 @@
};
tasha_snd: sound-9335 {
status = "disabled";
compatible = "qcom,sdm660-asoc-snd-tasha";
qcom,model = "sdm660-tasha-snd-card";
qcom,wcn-btfm;
qcom,mi2s-audio-intf;
qcom,auxpcm-audio-intf;
qcom,ext-disp-audio-rx;
qcom,wcn-btfm;
qcom,msm-mi2s-master = <1>, <1>, <1>, <1>;
qcom,audio-routing =
"AIF4 VI", "MCLK",
@@ -696,7 +710,6 @@
"MIC BIAS4", "Digital Mic5",
"SpkrLeft IN", "SPK1 OUT",
"SpkrRight IN", "SPK2 OUT";
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
qcom,us-euro-gpios = <&us_euro_gpio>;
@@ -715,11 +728,12 @@
"msm-pcm-routing", "msm-cpe-lsm",
"msm-compr-dsp", "msm-pcm-dsp-noirq",
"msm-cpe-lsm.3";
asoc-cpu = <&dai_dp>, <&dai_mi2s0>,
<&dai_mi2s1>,
<&dai_mi2s2>, <&dai_mi2s3>,
asoc-cpu = <&dai_dp>,
<&dai_mi2s0>, <&dai_mi2s1>, <&dai_mi2s2>,
<&dai_mi2s3>, <&dai_mi2s4>,
<&dai_pri_auxpcm>, <&dai_sec_auxpcm>,
<&dai_tert_auxpcm>, <&dai_quat_auxpcm>,
<&dai_quin_auxpcm>,
<&sb_0_rx>, <&sb_0_tx>, <&sb_1_rx>, <&sb_1_tx>,
<&sb_2_rx>, <&sb_2_tx>, <&sb_3_rx>, <&sb_3_tx>,
<&sb_4_rx>, <&sb_4_tx>, <&sb_5_tx>,
@@ -732,12 +746,16 @@
<&dai_pri_tdm_rx_0>, <&dai_pri_tdm_tx_0>,
<&dai_sec_tdm_rx_0>, <&dai_sec_tdm_tx_0>,
<&dai_tert_tdm_rx_0>, <&dai_tert_tdm_tx_0>,
<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>;
asoc-cpu-names = "msm-dai-q6-dp.24608", "msm-dai-q6-mi2s.0",
"msm-dai-q6-mi2s.1",
"msm-dai-q6-mi2s.2", "msm-dai-q6-mi2s.3",
<&dai_quat_tdm_rx_0>, <&dai_quat_tdm_tx_0>,
<&dai_quin_tdm_rx_0>, <&dai_quin_tdm_tx_0>,
<&proxy_rx>, <&proxy_tx>;
asoc-cpu-names = "msm-dai-q6-dp.0", "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-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-dev.16384", "msm-dai-q6-dev.16385",
"msm-dai-q6-dev.16386", "msm-dai-q6-dev.16387",
"msm-dai-q6-dev.16388", "msm-dai-q6-dev.16389",
@@ -755,15 +773,17 @@
"msm-dai-q6-tdm.36865", "msm-dai-q6-tdm.36880",
"msm-dai-q6-tdm.36881", "msm-dai-q6-tdm.36896",
"msm-dai-q6-tdm.36897", "msm-dai-q6-tdm.36912",
"msm-dai-q6-tdm.36913";
"msm-dai-q6-tdm.36913", "msm-dai-q6-tdm.36928",
"msm-dai-q6-tdm.36929",
"msm-dai-q6-dev.8194", "msm-dai-q6-dev.8195";
asoc-codec = <&stub_codec>, <&ext_disp_audio_codec>;
asoc-codec-names = "msm-stub-codec.1",
"msm-ext-disp-audio-codec-rx";
"msm-ext-disp-audio-codec-rx";
qcom,wsa-max-devs = <2>;
qcom,wsa-devs = <&wsa881x_211>, <&wsa881x_212>,
<&wsa881x_213>, <&wsa881x_214>;
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
"SpkrLeft", "SpkrRight";
"SpkrLeft", "SpkrRight";
};
us_euro_gpio: msm_cdc_pinctrl@75 {
@@ -784,11 +804,23 @@
clock_audio: audio_ext_clk {
status = "disabled";
compatible = "qcom,audio-ref-clk";
qcom,codec-ext-clk-src = <13>;
pinctrl-names = "default";
pinctrl-0 = <&pmi_clk_default>;
qcom,audio-ref-clk-gpio = <&pm660_gpios 3 0>;
clock-names = "osr_clk";
clocks = <&clock_rpmcc RPM_SMD_DIV_CLK1>;
qcom,node_has_rpm_clock;
#clock-cells = <1>;
};
clock_audio_native: audio_ext_clk_native {
status = "disabled";
compatible = "qcom,audio-ref-clk";
qcom,codec-ext-clk-src = <3>;
qcom,use-pinctrl = <1>;
clock-names = "osr_clk";
#clock-cells = <1>;
qcom,codec-mclk-clk-freq = <11289600>;
qcom,mclk-clk-reg = <0x15020018 0x0>;
pinctrl-names = "sleep", "active";
qcom/sdm660-audio.dtsi
+3 -15
View File
@@ -234,7 +234,6 @@
qcom,wsa-aux-dev-prefix = "SpkrLeft", "SpkrRight",
"SpkrLeft", "SpkrRight";
};
};
&slim_aud {
@@ -245,6 +244,7 @@
};
wcd9335: tasha_codec {
status = "disabled";
compatible = "qcom,tasha-slim-pgd";
elemental-addr = [00 01 a0 01 17 02];
@@ -256,8 +256,8 @@
qcom,wcd-rst-gpio-node = <&wcd_rst_gpio>;
clock-names = "wcd_clk", "wcd_native_clk";
clocks = <&clock_audio AUDIO_PMI_CLK>,
<&clock_audio AUDIO_LPASS_MCLK_2>;
clocks = <&clock_audio 0>,
<&clock_audio_native 0>;
cdc-vdd-mic-bias-supply = <&pm660l_bob>;
qcom,cdc-vdd-mic-bias-voltage = <3300000 3300000>;
@@ -489,15 +489,3 @@
};
};
};
&pm660_gpios {
gpio@c200 {
status = "ok"
qcom,mode = <1>;
qcom,pull = <4>;
qcom,vin-sel = <0>;
qcom,src-sel = <2>;
qcom,master-en = <1>;
qcom,out-strength = <2>;
};
};
qcom/sdm660-qrd-external-codec-overlay.dts
-1
View File
@@ -7,7 +7,6 @@
#include <dt-bindings/regulator/qcom,rpm-smd-regulator.h>
#include <dt-bindings/interrupt-controller/arm-gic.h>
#include "sdm660-wcd.dtsi"
#include "sdm660-qrd.dtsi"
/ {
qcom/sdm660-qrd.dtsi
+25 -2
View File
@@ -245,10 +245,32 @@
};
};
/delete-node/ &tasha_hph_en0;
/delete-node/ &tasha_hph_en1;
&wcd934x_cdc {
status = "disabled";
};
&tavil_snd {
status = "disabled";
};
&clock_audio_lnbb {
status = "disabled";
};
&clock_audio {
status = "ok"
};
&clock_audio_native {
status = "ok"
};
&wcd9335 {
status = "ok"
};
&tasha_snd {
status = "ok"
qcom,model = "sdm660-tasha-skus-snd-card";
qcom,audio-routing =
"AIF4 VI", "MCLK",
@@ -264,6 +286,7 @@
"MIC BIAS3", "Digital Mic5",
"SpkrLeft IN", "SPK1 OUT";
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
/delete-property/ qcom,us-euro-gpios;
/delete-property/ qcom,hph-en0-gpio;
/delete-property/ qcom,hph-en1-gpio;