| Message ID | 20230612173758.286411-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 9f5ebcd61009de388af6f66509f2a1169f90dbbe |
| Headers | show |
| Series | [1/2] arm64: dts: qcom: sm8550-qrd: add sound card | expand |
On 12.06.2023 19:37, Krzysztof Kozlowski wrote: > Add the sound card node with tested playback over WSA8845 speakers and > WCD9385 headset over USB Type-C. The recording links were not tested, > but should be similar to previous platforms. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > Not tested on hardware. Should be the same as on QRD8550. > --- For that reason: Acked-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad > arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 81 +++++++++++++++++++++++++ > 1 file changed, 81 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts > index 54f8957499a3..34b548b3e43d 100644 > --- a/arch/arm64/boot/dts/qcom/sm8550-mtp.dts > +++ b/arch/arm64/boot/dts/qcom/sm8550-mtp.dts > @@ -95,6 +95,87 @@ pmic_glink_sbu: endpoint { > }; > }; > > + sound { > + compatible = "qcom,sm8550-sndcard", "qcom,sm8450-sndcard"; > + model = "SM8550-MTP"; > + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", > + "SpkrRight IN", "WSA_SPK2 OUT", > + "IN1_HPHL", "HPHL_OUT", > + "IN2_HPHR", "HPHR_OUT", > + "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"; > + > + wcd-playback-dai-link { > + link-name = "WCD Playback"; > + > + cpu { > + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + wcd-capture-dai-link { > + link-name = "WCD Capture"; > + > + cpu { > + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; > + }; > + > + codec { > + sound-dai = <&wcd938x 1>, <&swr2 0>, <&lpass_txmacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + wsa-dai-link { > + link-name = "WSA Playback"; > + > + cpu { > + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&left_spkr>, <&right_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + va-dai-link { > + link-name = "VA Capture"; > + > + cpu { > + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; > + }; > + > + codec { > + sound-dai = <&lpass_vamacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + }; > + > vph_pwr: vph-pwr-regulator { > compatible = "regulator-fixed"; > regulator-name = "vph_pwr";
On Mon, 12 Jun 2023 19:37:57 +0200, Krzysztof Kozlowski wrote: > Add the sound card node with tested playback over WSA8845 speakers and > WCD9385 headset over USB Type-C. The recording links were not tested, > but should be similar to previous platforms. > > Applied, thanks! [1/2] arm64: dts: qcom: sm8550-qrd: add sound card commit: 9f5ebcd61009de388af6f66509f2a1169f90dbbe [2/2] arm64: dts: qcom: sm8550-mtp: add sound card commit: 3f01d016cf4b80382f1c1b8ab6bef7aa76dece01 Best regards,
Hi Krzysztof, On 6/12/2023 10:37 AM, Krzysztof Kozlowski wrote: > Add the sound card node with tested playback over WSA8845 speakers and > WCD9385 headset over USB Type-C. The recording links were not tested, > but should be similar to previous platforms. > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > > --- > > Bindings for the sound card were not sent to LKML. Work-in-progress is > available here: > https://github.com/krzk/linux/tree/n/audio-wsa884x-on-top-of-wip-sm8450-audio-on-next Do you plan to send the bindings up? I can send this patch out if you don't have the cycle: https://github.com/krzk/linux/commit/f678691570386a11eb75dceca7291b4e05d981da > > Depends on my previous patch adding WSA8845 speakers: > https://lore.kernel.org/linux-arm-msm/20230608094323.267278-1-krzysztof.kozlowski@linaro.org/T/#t > --- > arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 81 +++++++++++++++++++++++++ > 1 file changed, 81 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts > index 7ef7079dd640..cb0369fbbc81 100644 > --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts > +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts > @@ -97,6 +97,87 @@ pmic_glink_sbu: endpoint { > }; > }; > > + sound { > + compatible = "qcom,sm8550-sndcard", "qcom,sm8450-sndcard"; > + model = "SM8550-QRD"; > + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", > + "SpkrRight IN", "WSA_SPK2 OUT", > + "IN1_HPHL", "HPHL_OUT", > + "IN2_HPHR", "HPHR_OUT", > + "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"; > + > + wcd-playback-dai-link { > + link-name = "WCD Playback"; > + > + cpu { > + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + wcd-capture-dai-link { > + link-name = "WCD Capture"; > + > + cpu { > + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; > + }; > + > + codec { > + sound-dai = <&wcd938x 1>, <&swr2 0>, <&lpass_txmacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + wsa-dai-link { > + link-name = "WSA Playback"; > + > + cpu { > + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; > + }; > + > + codec { > + sound-dai = <&north_spkr>, <&south_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + > + va-dai-link { > + link-name = "VA Capture"; > + > + cpu { > + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; > + }; > + > + codec { > + sound-dai = <&lpass_vamacro 0>; > + }; > + > + platform { > + sound-dai = <&q6apm>; > + }; > + }; > + }; > + > vph_pwr: vph-pwr-regulator { > compatible = "regulator-fixed"; > regulator-name = "vph_pwr";
On 04/11/2023 00:10, Elliot Berman wrote: > Hi Krzysztof, > > On 6/12/2023 10:37 AM, Krzysztof Kozlowski wrote: >> Add the sound card node with tested playback over WSA8845 speakers and >> WCD9385 headset over USB Type-C. The recording links were not tested, >> but should be similar to previous platforms. >> >> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >> >> --- >> >> Bindings for the sound card were not sent to LKML. Work-in-progress is >> available here: >> https://github.com/krzk/linux/tree/n/audio-wsa884x-on-top-of-wip-sm8450-audio-on-next > > Do you plan to send the bindings up? I can send this patch out if you don't have the cycle: > > https://github.com/krzk/linux/commit/f678691570386a11eb75dceca7291b4e05d981da The patch itself does not make sense without dependencies. It should be sent after dependencies are sent. Best regards, Krzysztof
On 11/5/2023 4:55 AM, Krzysztof Kozlowski wrote: > On 04/11/2023 00:10, Elliot Berman wrote: >> Hi Krzysztof, >> >> On 6/12/2023 10:37 AM, Krzysztof Kozlowski wrote: >>> Add the sound card node with tested playback over WSA8845 speakers and >>> WCD9385 headset over USB Type-C. The recording links were not tested, >>> but should be similar to previous platforms. >>> >>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>> >>> --- >>> >>> Bindings for the sound card were not sent to LKML. Work-in-progress is >>> available here: >>> https://github.com/krzk/linux/tree/n/audio-wsa884x-on-top-of-wip-sm8450-audio-on-next >> >> Do you plan to send the bindings up? I can send this patch out if you don't have the cycle: >> >> https://github.com/krzk/linux/commit/f678691570386a11eb75dceca7291b4e05d981da > > The patch itself does not make sense without dependencies. It should be > sent after dependencies are sent. > I think the patch makes sense now that the v6.6 sm8550-mtp.dtb is using the compatible: https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/tree/arch/arm64/boot/dts/qcom/sm8550-mtp.dts?h=v6.6#n100 - Elliot
On 06/11/2023 18:07, Elliot Berman wrote: > > > On 11/5/2023 4:55 AM, Krzysztof Kozlowski wrote: >> On 04/11/2023 00:10, Elliot Berman wrote: >>> Hi Krzysztof, >>> >>> On 6/12/2023 10:37 AM, Krzysztof Kozlowski wrote: >>>> Add the sound card node with tested playback over WSA8845 speakers and >>>> WCD9385 headset over USB Type-C. The recording links were not tested, >>>> but should be similar to previous platforms. >>>> >>>> Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> >>>> >>>> --- >>>> >>>> Bindings for the sound card were not sent to LKML. Work-in-progress is >>>> available here: >>>> https://github.com/krzk/linux/tree/n/audio-wsa884x-on-top-of-wip-sm8450-audio-on-next >>> >>> Do you plan to send the bindings up? I can send this patch out if you don't have the cycle: >>> >>> https://github.com/krzk/linux/commit/f678691570386a11eb75dceca7291b4e05d981da >> >> The patch itself does not make sense without dependencies. It should be >> sent after dependencies are sent. >> > > I think the patch makes sense now that the v6.6 sm8550-mtp.dtb is using the compatible: The dependencies were not sent. Still. But sure, I can send the patch, why not. Best regards, Krzysztof
diff --git a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts index 7ef7079dd640..cb0369fbbc81 100644 --- a/arch/arm64/boot/dts/qcom/sm8550-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8550-qrd.dts @@ -97,6 +97,87 @@ pmic_glink_sbu: endpoint { }; }; + sound { + compatible = "qcom,sm8550-sndcard", "qcom,sm8450-sndcard"; + model = "SM8550-QRD"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "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"; + + wcd-playback-dai-link { + link-name = "WCD Playback"; + + cpu { + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&wcd938x 0>, <&swr1 0>, <&lpass_rxmacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wcd-capture-dai-link { + link-name = "WCD Capture"; + + cpu { + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; + }; + + codec { + sound-dai = <&wcd938x 1>, <&swr2 0>, <&lpass_txmacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + wsa-dai-link { + link-name = "WSA Playback"; + + cpu { + sound-dai = <&q6apmbedai WSA_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&north_spkr>, <&south_spkr>, <&swr0 0>, <&lpass_wsamacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + + va-dai-link { + link-name = "VA Capture"; + + cpu { + sound-dai = <&q6apmbedai TX_CODEC_DMA_TX_3>; + }; + + codec { + sound-dai = <&lpass_vamacro 0>; + }; + + platform { + sound-dai = <&q6apm>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; regulator-name = "vph_pwr";
Add the sound card node with tested playback over WSA8845 speakers and WCD9385 headset over USB Type-C. The recording links were not tested, but should be similar to previous platforms. Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- Bindings for the sound card were not sent to LKML. Work-in-progress is available here: https://github.com/krzk/linux/tree/n/audio-wsa884x-on-top-of-wip-sm8450-audio-on-next Depends on my previous patch adding WSA8845 speakers: https://lore.kernel.org/linux-arm-msm/20230608094323.267278-1-krzysztof.kozlowski@linaro.org/T/#t --- arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 81 +++++++++++++++++++++++++ 1 file changed, 81 insertions(+)