Merge "ARM: dts: msm: add swr dmic's as codecs"

This commit is contained in:
qctecmdr 2020-03-29 00:33:16 -07:00 • committed by Gerrit - the friendly Code Review server
commit 1c3c85283f

View file

@ -83,7 +83,7 @@
compatible = "qcom,swr-dmic";
reg = <0x08 0x58350220>;
qcom,swr-dmic-prefix = "SWR_MIC0";
qcom,codec-name = "swr-dmic-01";
qcom,codec-name = "swr-dmic.01";
qcom,swr-dmic-supply = <3>;
qcom,wcd-handle = <&wcd938x_codec>;
};
@ -92,7 +92,7 @@
compatible = "qcom,swr-dmic";
reg = <0x08 0x58350221>;
qcom,swr-dmic-prefix = "SWR_MIC1";
qcom,codec-name = "swr-dmic-02";
qcom,codec-name = "swr-dmic.02";
qcom,swr-dmic-supply = <1>;
qcom,wcd-handle = <&wcd938x_codec>;
};
@ -101,7 +101,7 @@
compatible = "qcom,swr-dmic";
reg = <0x08 0x58350222>;
qcom,swr-dmic-prefix = "SWR_MIC2";
qcom,codec-name = "swr-dmic-03";
qcom,codec-name = "swr-dmic.03";
qcom,swr-dmic-supply = <1>;
qcom,wcd-handle = <&wcd938x_codec>;
};
@ -110,7 +110,7 @@
compatible = "qcom,swr-dmic";
reg = <0x08 0x58350223>;
qcom,swr-dmic-prefix = "SWR_MIC3";
qcom,codec-name = "swr-dmic-04";
qcom,codec-name = "swr-dmic.04";
qcom,swr-dmic-supply = <3>;
qcom,wcd-handle = <&wcd938x_codec>;
};
@ -198,6 +198,7 @@
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
qcom,wsa-prefix = "SpkrLeft";
};
wsa883x_0222: wsa883x@02170222 {
@ -210,6 +211,7 @@
qcom,cdc-vdd-1p8-voltage = <1800000 1800000>;
qcom,cdc-vdd-1p8-current = <20000>;
qcom,cdc-static-supplies = "cdc-vdd-1p8";
qcom,wsa-prefix = "SpkrRight";
};
};
};
@ -338,8 +340,17 @@
"Digital Mic5", "VA MIC BIAS4";
qcom,msm-mbhc-hphl-swh = <1>;
qcom,msm-mbhc-gnd-swh = <1>;
asoc-codec = <&stub_codec>, <&bolero>, <&ext_disp_audio_codec>;
asoc-codec = <&stub_codec>, <&bolero>,
<&wcd938x_codec>,
<&wsa883x_0221>, <&wsa883x_0222>,
<&swr_dmic_01>, <&swr_dmic_02>,
<&swr_dmic_03>, <&swr_dmic_04>,
<&ext_disp_audio_codec>;
asoc-codec-names = "msm-stub-codec.1", "bolero_codec",
"wcd938x_codec",
"wsa-codec1", "wsa-codec2",
"swr-dmic.01", "swr-dmic.02",
"swr-dmic.03", "swr-dmic.04",
"msm-ext-disp-audio-codec-rx";
qcom,wsa-max-devs = <2>;
qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>;