diff mbox series

arm64: dts: qcom: sm8450-hdk: add other analogue microphones

Message ID 20230717143824.203352-1-krzysztof.kozlowski@linaro.org
State Accepted
Commit f20cf2bc3f770a4f8ce098effbcae5ef5a0912a7
Headers show
Series arm64: dts: qcom: sm8450-hdk: add other analogue microphones | expand

Commit Message

Krzysztof Kozlowski July 17, 2023, 2:38 p.m. UTC
Add proper audio routes for onboard analogue microphones: AMIC[1345].
Use also new DAPM input widget (TX SWR_INPUTn) for them, not the
deprecated ADC one.  Change is not compatible with older kernels not
having the new SWR_INPUTn input widget.

Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>

---

Depends on ASoC driver changes:
https://lore.kernel.org/alsa-devel/20230717140138.201745-1-krzysztof.kozlowski@linaro.org/T/#t
This patch should wait till respective ASoC changes got merged.
---
 arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 23 ++++++++++++++++-------
 1 file changed, 16 insertions(+), 7 deletions(-)

Comments

Srinivas Kandagatla July 18, 2023, 9:40 a.m. UTC | #1
On 17/07/2023 15:38, Krzysztof Kozlowski wrote:
> Add proper audio routes for onboard analogue microphones: AMIC[1345].
> Use also new DAPM input widget (TX SWR_INPUTn) for them, not the
> deprecated ADC one.  Change is not compatible with older kernels not
> having the new SWR_INPUTn input widget.
> 
> Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org>
> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
> 
> ---
> 
> Depends on ASoC driver changes:
> https://lore.kernel.org/alsa-devel/20230717140138.201745-1-krzysztof.kozlowski@linaro.org/T/#t
> This patch should wait till respective ASoC changes got merged.
> ---
>   arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 23 ++++++++++++++++-------
>   1 file changed, 16 insertions(+), 7 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
> index bd5e8181f2aa..9bd1ef401ca3 100644
> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
> @@ -915,14 +915,23 @@ &sound {
>   			"SpkrRight IN", "WSA_SPK2 OUT",
>   			"IN1_HPHL", "HPHL_OUT",
>   			"IN2_HPHR", "HPHR_OUT",
> +			"AMIC1", "MIC BIAS1",
>   			"AMIC2", "MIC BIAS2",
> -			"VA DMIC0", "MIC BIAS1",
> -			"VA DMIC1", "MIC BIAS1",
> -			"VA DMIC2", "MIC BIAS3",
> -			"TX DMIC0", "MIC BIAS1",
> -			"TX DMIC1", "MIC BIAS2",
> -			"TX DMIC2", "MIC BIAS3",
> -			"TX SWR_ADC1", "ADC2_OUTPUT";
> +			"AMIC3", "MIC BIAS3",
> +			"AMIC4", "MIC BIAS3",
> +			"AMIC5", "MIC BIAS4",
These should reflect the board-level wiring of MIC BIAS, are you sure 
that this is how the hdk is wired up?

> +			"VA DMIC0", "MIC BIAS3",
> +			"VA DMIC1", "MIC BIAS3",
> +			"VA DMIC2", "MIC BIAS1",
> +			"VA DMIC3", "MIC BIAS1",
> +			"TX DMIC0", "MIC BIAS3",
> +			"TX DMIC1", "MIC BIAS3",
> +			"TX DMIC2", "MIC BIAS1",
> +			"TX DMIC3", "MIC BIAS1",
Same here.

--srini
> +			"TX SWR_INPUT0", "ADC1_OUTPUT",
> +			"TX SWR_INPUT1", "ADC2_OUTPUT",
> +			"TX SWR_INPUT2", "ADC3_OUTPUT",
> +			"TX SWR_INPUT3", "ADC4_OUTPUT";
>   
>   	wcd-playback-dai-link {
>   		link-name = "WCD Playback";
Krzysztof Kozlowski July 18, 2023, 9:47 a.m. UTC | #2
On 18/07/2023 11:40, Srinivas Kandagatla wrote:
>> diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
>> index bd5e8181f2aa..9bd1ef401ca3 100644
>> --- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
>> +++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
>> @@ -915,14 +915,23 @@ &sound {
>>   			"SpkrRight IN", "WSA_SPK2 OUT",
>>   			"IN1_HPHL", "HPHL_OUT",
>>   			"IN2_HPHR", "HPHR_OUT",
>> +			"AMIC1", "MIC BIAS1",
>>   			"AMIC2", "MIC BIAS2",
>> -			"VA DMIC0", "MIC BIAS1",
>> -			"VA DMIC1", "MIC BIAS1",
>> -			"VA DMIC2", "MIC BIAS3",
>> -			"TX DMIC0", "MIC BIAS1",
>> -			"TX DMIC1", "MIC BIAS2",
>> -			"TX DMIC2", "MIC BIAS3",
>> -			"TX SWR_ADC1", "ADC2_OUTPUT";
>> +			"AMIC3", "MIC BIAS3",
>> +			"AMIC4", "MIC BIAS3",
>> +			"AMIC5", "MIC BIAS4",
> These should reflect the board-level wiring of MIC BIAS, are you sure 
> that this is how the hdk is wired up?

If I read the schematics correctly, then yes. You can double check, if I
understood this right: page 40 of HDK schematics

Best regards,
Krzysztof
Bjorn Andersson Sept. 19, 2023, 11:07 p.m. UTC | #3
On Mon, 17 Jul 2023 16:38:24 +0200, Krzysztof Kozlowski wrote:
> Add proper audio routes for onboard analogue microphones: AMIC[1345].
> Use also new DAPM input widget (TX SWR_INPUTn) for them, not the
> deprecated ADC one.  Change is not compatible with older kernels not
> having the new SWR_INPUTn input widget.
> 
> 

Applied, thanks!

[1/1] arm64: dts: qcom: sm8450-hdk: add other analogue microphones
      commit: f20cf2bc3f770a4f8ce098effbcae5ef5a0912a7

Best regards,
diff mbox series

Patch

diff --git a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
index bd5e8181f2aa..9bd1ef401ca3 100644
--- a/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
+++ b/arch/arm64/boot/dts/qcom/sm8450-hdk.dts
@@ -915,14 +915,23 @@  &sound {
 			"SpkrRight IN", "WSA_SPK2 OUT",
 			"IN1_HPHL", "HPHL_OUT",
 			"IN2_HPHR", "HPHR_OUT",
+			"AMIC1", "MIC BIAS1",
 			"AMIC2", "MIC BIAS2",
-			"VA DMIC0", "MIC BIAS1",
-			"VA DMIC1", "MIC BIAS1",
-			"VA DMIC2", "MIC BIAS3",
-			"TX DMIC0", "MIC BIAS1",
-			"TX DMIC1", "MIC BIAS2",
-			"TX DMIC2", "MIC BIAS3",
-			"TX SWR_ADC1", "ADC2_OUTPUT";
+			"AMIC3", "MIC BIAS3",
+			"AMIC4", "MIC BIAS3",
+			"AMIC5", "MIC BIAS4",
+			"VA DMIC0", "MIC BIAS3",
+			"VA DMIC1", "MIC BIAS3",
+			"VA DMIC2", "MIC BIAS1",
+			"VA DMIC3", "MIC BIAS1",
+			"TX DMIC0", "MIC BIAS3",
+			"TX DMIC1", "MIC BIAS3",
+			"TX DMIC2", "MIC BIAS1",
+			"TX DMIC3", "MIC BIAS1",
+			"TX SWR_INPUT0", "ADC1_OUTPUT",
+			"TX SWR_INPUT1", "ADC2_OUTPUT",
+			"TX SWR_INPUT2", "ADC3_OUTPUT",
+			"TX SWR_INPUT3", "ADC4_OUTPUT";
 
 	wcd-playback-dai-link {
 		link-name = "WCD Playback";