| Message ID | 20230302115741.7726-5-srinivas.kandagatla@linaro.org (mailing list archive) |
|---|---|
| State | Accepted |
| Commit | 2e498f35c385654396e94cf12e097522d3973d41 |
| Headers | show |
| Series | arm64: dts: qcom: sc8280xp: fix audio dts | expand |
On 2.03.2023 12:57, Srinivas Kandagatla wrote: > VA dmics 0, 1, 2 micbias on X13s are connected to WCD MICBIAS1, WCD MICBIAS1 > and WCD MICBIAS3 respectively. Reflect this in dt to get dmics working. I'm far from good when it comes to sound, but is it expected that (VA DMICn) are are connected to both (MIC BIASn) and (VA MIC BIAS{1, 1, 3})? > Also fix dmics to go via VA Macro instead of TX macro to fix device switching. > > Fixes: 8c1ea87e80b4 ("arm64: dts: qcom: sc8280xp-x13s: Add soundcard support") If that doesn't depend on any driver changes, please Cc stable so that distros will pick this up. Konrad > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > --- > .../arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 8 ++++---- > 1 file changed, 4 insertions(+), 4 deletions(-) > > diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts > index d18d405d1776..89230112e288 100644 > --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts > +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts > @@ -933,9 +933,9 @@ > "VA DMIC0", "MIC BIAS1", > "VA DMIC1", "MIC BIAS1", > "VA DMIC2", "MIC BIAS3", > - "TX DMIC0", "MIC BIAS1", > - "TX DMIC1", "MIC BIAS2", > - "TX DMIC2", "MIC BIAS3", > + "VA DMIC0", "VA MIC BIAS1", > + "VA DMIC1", "VA MIC BIAS1", > + "VA DMIC2", "VA MIC BIAS3", > "TX SWR_ADC1", "ADC2_OUTPUT"; > > wcd-playback-dai-link { > @@ -986,7 +986,7 @@ > va-dai-link { > link-name = "VA Capture"; > cpu { > - sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; > + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; > }; > > platform {
On 02/03/2023 12:28, Konrad Dybcio wrote: > > > On 2.03.2023 12:57, Srinivas Kandagatla wrote: >> VA dmics 0, 1, 2 micbias on X13s are connected to WCD MICBIAS1, WCD MICBIAS1 >> and WCD MICBIAS3 respectively. Reflect this in dt to get dmics working. > I'm far from good when it comes to sound, but is it expected that > (VA DMICn) are are connected to both (MIC BIASn) and (VA MIC BIAS{1, 1, 3})? > one DMIC data lane can be used to connect to two DMICs, for L and R data. So the MIC Bias line too, so for DMIC0, and DMIC1 which is connected to MICBIAS1 and DMIC2 is connected to BIAS3. Why its bias3 line instead of bias2 is totally board dependent and how the wiring is done. >> Also fix dmics to go via VA Macro instead of TX macro to fix device switching. >> >> Fixes: 8c1ea87e80b4 ("arm64: dts: qcom: sc8280xp-x13s: Add soundcard support") > If that doesn't depend on any driver changes, please Cc stable > so that distros will pick this up. These patches are about to appear in rc1.. so I don't see any help adding stable. --srini > > Konrad >> Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> >> --- >> .../arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 8 ++++---- >> 1 file changed, 4 insertions(+), 4 deletions(-) >> >> diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts >> index d18d405d1776..89230112e288 100644 >> --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts >> +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts >> @@ -933,9 +933,9 @@ >> "VA DMIC0", "MIC BIAS1", >> "VA DMIC1", "MIC BIAS1", >> "VA DMIC2", "MIC BIAS3", >> - "TX DMIC0", "MIC BIAS1", >> - "TX DMIC1", "MIC BIAS2", >> - "TX DMIC2", "MIC BIAS3", >> + "VA DMIC0", "VA MIC BIAS1", >> + "VA DMIC1", "VA MIC BIAS1", >> + "VA DMIC2", "VA MIC BIAS3", >> "TX SWR_ADC1", "ADC2_OUTPUT"; >> >> wcd-playback-dai-link { >> @@ -986,7 +986,7 @@ >> va-dai-link { >> link-name = "VA Capture"; >> cpu { >> - sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; >> + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; >> }; >> >> platform {
diff --git a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts index d18d405d1776..89230112e288 100644 --- a/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +++ b/arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts @@ -933,9 +933,9 @@ "VA DMIC0", "MIC BIAS1", "VA DMIC1", "MIC BIAS1", "VA DMIC2", "MIC BIAS3", - "TX DMIC0", "MIC BIAS1", - "TX DMIC1", "MIC BIAS2", - "TX DMIC2", "MIC BIAS3", + "VA DMIC0", "VA MIC BIAS1", + "VA DMIC1", "VA MIC BIAS1", + "VA DMIC2", "VA MIC BIAS3", "TX SWR_ADC1", "ADC2_OUTPUT"; wcd-playback-dai-link { @@ -986,7 +986,7 @@ va-dai-link { link-name = "VA Capture"; cpu { - sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; + sound-dai = <&q6apmbedai VA_CODEC_DMA_TX_0>; }; platform {
VA dmics 0, 1, 2 micbias on X13s are connected to WCD MICBIAS1, WCD MICBIAS1 and WCD MICBIAS3 respectively. Reflect this in dt to get dmics working. Also fix dmics to go via VA Macro instead of TX macro to fix device switching. Fixes: 8c1ea87e80b4 ("arm64: dts: qcom: sc8280xp-x13s: Add soundcard support") Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> --- .../arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-)