From f34f6ecd56bfac95ef16b03b6a29aec6e8b49408 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Wed, 5 Feb 2020 13:05:48 -0800 Subject: [PATCH 1/3] ARM: dts: msm: add wcd938x as a codec Add wcd938x as a codec, which is currently an aux device. Change-Id: I590e5a10cb861f7577059121299f6c87603442b4 --- qcom/lahaina-audio-overlay.dtsi | 5 ++++- 1 file changed, 4 insertions(+), 1 deletion(-) diff --git a/qcom/lahaina-audio-overlay.dtsi b/qcom/lahaina-audio-overlay.dtsi index a009b563efec..87669c143d0b 100644 --- a/qcom/lahaina-audio-overlay.dtsi +++ b/qcom/lahaina-audio-overlay.dtsi @@ -338,8 +338,11 @@ "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>, + <&ext_disp_audio_codec>; asoc-codec-names = "msm-stub-codec.1", "bolero_codec", + "wcd938x_codec", "msm-ext-disp-audio-codec-rx"; qcom,wsa-max-devs = <2>; qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>; From 6a5acc6c7ae2bd1ae0b4fd0ade66bfefbf306369 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Wed, 5 Feb 2020 13:18:56 -0800 Subject: [PATCH 2/3] ARM: dts: msm: add wsa883x as codecs Add wsa883x as codecs, which are currently added as aux devices. Change-Id: I443696da8aa069304c59b43b716945375749fd90 --- qcom/lahaina-audio-overlay.dtsi | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/qcom/lahaina-audio-overlay.dtsi b/qcom/lahaina-audio-overlay.dtsi index 87669c143d0b..32f8c11eb588 100644 --- a/qcom/lahaina-audio-overlay.dtsi +++ b/qcom/lahaina-audio-overlay.dtsi @@ -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"; }; }; }; @@ -340,9 +342,11 @@ qcom,msm-mbhc-gnd-swh = <1>; asoc-codec = <&stub_codec>, <&bolero>, <&wcd938x_codec>, + <&wsa883x_0221>, <&wsa883x_0222>, <&ext_disp_audio_codec>; asoc-codec-names = "msm-stub-codec.1", "bolero_codec", "wcd938x_codec", + "wsa-codec1", "wsa-codec2", "msm-ext-disp-audio-codec-rx"; qcom,wsa-max-devs = <2>; qcom,wsa-devs = <&wsa883x_0221>, <&wsa883x_0222>; From 9b24c0cb787be791a38a52c603b939c77755b024 Mon Sep 17 00:00:00 2001 From: Vignesh Kulothungan Date: Fri, 28 Feb 2020 19:17:46 -0800 Subject: [PATCH 3/3] ARM: dts: msm: add swr dmic's as codecs Add swr dmic's as codecs, which are currently added as aux devices. Change-Id: I042c3ce0275db5d7fe22da9534e3ae7c59638424 --- qcom/lahaina-audio-overlay.dtsi | 12 ++++++++---- 1 file changed, 8 insertions(+), 4 deletions(-) diff --git a/qcom/lahaina-audio-overlay.dtsi b/qcom/lahaina-audio-overlay.dtsi index 32f8c11eb588..a5a0305bb412 100644 --- a/qcom/lahaina-audio-overlay.dtsi +++ b/qcom/lahaina-audio-overlay.dtsi @@ -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>; }; @@ -343,10 +343,14 @@ 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>;