* [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD
@ 2024-01-25 16:42 Neil Armstrong
2024-01-25 16:42 ` [PATCH 1/3] arm64: dts: qcom: sm8650-qrd: add Audio nodes Neil Armstrong
` (3 more replies)
0 siblings, 4 replies; 6+ messages in thread
From: Neil Armstrong @ 2024-01-25 16:42 UTC (permalink / raw)
To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski,
Conor Dooley, Catalin Marinas, Will Deacon
Cc: linux-arm-msm, devicetree, linux-kernel, linux-arm-kernel,
Neil Armstrong
Add the remaining Audio nodes on the SM8650-QRD & MTP boards including:
- Qualcomm Aqstic WCD9395 audio codec on the RX & TX Soundwire interfaces
- WSA8845 Left & Right Speakers
- Link the WCD9395 Codec node to the WCD9395 USB SubSystem node to handle
the USB-C Audio Accessory Mode events & lane swapping
- Sound card with routing for Speakers and Microphones
Finally enable the missing modules in arm64 defconfig now
the WCD939x codec driver has been applied.
Dependencies:
- altmode: https://lore.kernel.org/all/20240123-topic-sm8650-upstream-altmode-v3-0-300a5ac80e1e@linaro.org/
Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org>
---
Neil Armstrong (3):
arm64: dts: qcom: sm8650-qrd: add Audio nodes
arm64: dts: qcom: sm8650-mtp: add Audio sound card node
arm64: defconfig: enable audio drivers for SM8650 QRD board
arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 23 ++++
arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 203 ++++++++++++++++++++++++++++++++
arch/arm64/configs/defconfig | 3 +
3 files changed, 229 insertions(+)
---
base-commit: 63be584a33c3c63114aa3866f7cbcb45fa751e60
change-id: 20240125-topic-sm8650-upstream-audio-dt-1daca65777ba
Best regards,
--
Neil Armstrong <neil.armstrong@linaro.org>
^ permalink raw reply [flat|nested] 6+ messages in thread* [PATCH 1/3] arm64: dts: qcom: sm8650-qrd: add Audio nodes 2024-01-25 16:42 [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Neil Armstrong @ 2024-01-25 16:42 ` Neil Armstrong 2024-01-25 16:42 ` [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add Audio sound card node Neil Armstrong ` (2 subsequent siblings) 3 siblings, 0 replies; 6+ messages in thread From: Neil Armstrong @ 2024-01-25 16:42 UTC (permalink / raw) To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-arm-msm, devicetree, linux-kernel, linux-arm-kernel, Neil Armstrong Add the remaining Audio nodes on the SM8650-QRD board including: - Qualcomm Aqstic WCD9395 audio codec on the RX & TX Soundwire interfaces - WSA8845 Left & Right Speakers - Link the WCD9395 Codec node to the WCD9395 USB SubSystem node to handle the USB-C Audio Accessory Mode events & lane swapping - Sound card with routing for Speakers and Microphones Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 203 ++++++++++++++++++++++++++++++++ 1 file changed, 203 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts index 8515498553bf..277b1ba81685 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-qrd.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-qrd.dts @@ -92,6 +92,72 @@ pmic_glink_sbu: endpoint { }; }; + sound { + compatible = "qcom,sm8650-sndcard", "qcom,sm8450-sndcard"; + model = "SM8650-QRD"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT", + "IN1_HPHL", "HPHL_OUT", + "IN2_HPHR", "HPHR_OUT", + "AMIC1", "MIC BIAS1", + "AMIC2", "MIC BIAS2", + "AMIC3", "MIC BIAS3", + "AMIC4", "MIC BIAS3", + "AMIC5", "MIC BIAS4", + "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"; + + cpu { + sound-dai = <&q6apmbedai RX_CODEC_DMA_RX_0>; + }; + + codec { + sound-dai = <&wcd939x 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 = <&wcd939x 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>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; @@ -102,6 +168,41 @@ vph_pwr: vph-pwr-regulator { regulator-always-on; regulator-boot-on; }; + + wcd939x: audio-codec { + compatible = "qcom,wcd9395-codec", "qcom,wcd9390-codec"; + + pinctrl-0 = <&wcd_default>; + pinctrl-names = "default"; + + qcom,micbias1-microvolt = <1800000>; + qcom,micbias2-microvolt = <1800000>; + qcom,micbias3-microvolt = <1800000>; + qcom,micbias4-microvolt = <1800000>; + qcom,mbhc-buttons-vthreshold-microvolt = <75000 150000 237000 500000 500000 500000 500000 500000>; + qcom,mbhc-headset-vthreshold-microvolt = <1700000>; + qcom,mbhc-headphone-vthreshold-microvolt = <50000>; + qcom,rx-device = <&wcd_rx>; + qcom,tx-device = <&wcd_tx>; + + reset-gpios = <&tlmm 107 GPIO_ACTIVE_LOW>; + + vdd-buck-supply = <&vreg_l15b_1p8>; + vdd-rxtx-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l15b_1p8>; + vdd-mic-bias-supply = <&vreg_bob1>; + + #sound-dai-cells = <1>; + + mode-switch; + orientation-switch; + + port { + wcd_codec_headset_in: endpoint { + remote-endpoint = <&wcd_usbss_headset_out>; + }; + }; + }; }; &apps_rsc { @@ -478,6 +579,14 @@ wcd_usbss_sbu_mux: endpoint { remote-endpoint = <&pmic_glink_sbu>; }; }; + + port@1 { + reg = <1>; + + wcd_usbss_headset_out: endpoint { + remote-endpoint = <&wcd_codec_headset_in>; + }; + }; }; }; }; @@ -525,6 +634,16 @@ &ipa { status = "okay"; }; +&lpass_tlmm { + spkr_1_sd_n_active: spkr-1-sd-n-active-state { + pins = "gpio21"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; +}; + &mdss { status = "okay"; }; @@ -743,6 +862,74 @@ touchscreen@0 { }; }; +&swr0 { + status = "okay"; + + /* WSA8845, Speaker Left */ + left_spkr: speaker@0,0 { + compatible = "sdw20217020400"; + reg = <0 0>; + pinctrl-0 = <&spkr_1_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&lpass_tlmm 21 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrLeft"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l3c_1p2>; + }; + + /* WSA8845, Speaker Right */ + right_spkr: speaker@0,1 { + compatible = "sdw20217020400"; + reg = <0 1>; + pinctrl-0 = <&spkr_2_sd_n_active>; + pinctrl-names = "default"; + powerdown-gpios = <&tlmm 77 GPIO_ACTIVE_LOW>; + #sound-dai-cells = <0>; + sound-name-prefix = "SpkrRight"; + vdd-1p8-supply = <&vreg_l15b_1p8>; + vdd-io-supply = <&vreg_l3c_1p2>; + }; +}; + +&swr1 { + status = "okay"; + + /* WCD9395 RX */ + wcd_rx: codec@0,4 { + compatible = "sdw20217010e00"; + reg = <0 4>; + + /* + * WCD9395 RX Port 1 (HPH_L/R) <=> SWR1 Port 1 (HPH_L/R) + * WCD9395 RX Port 2 (CLSH) <=> SWR1 Port 2 (CLSH) + * WCD9395 RX Port 3 (COMP_L/R) <=> SWR1 Port 3 (COMP_L/R) + * WCD9395 RX Port 4 (LO) <=> SWR1 Port 4 (LO) + * WCD9395 RX Port 5 (DSD_L/R) <=> SWR1 Port 5 (DSD_L/R) + * WCD9395 RX Port 6 (HIFI_PCM_L/R) <=> SWR1 Port 9 (HIFI_PCM_L/R) + */ + qcom,rx-port-mapping = <1 2 3 4 5 9>; + }; +}; + +&swr2 { + status = "okay"; + + /* WCD9395 TX */ + wcd_tx: codec@0,3 { + compatible = "sdw20217010e00"; + reg = <0 3>; + + /* + * WCD9395 TX Port 1 (ADC1,2,3,4) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 2 (ADC3,4 & DMIC0,1) <=> SWR2 Port 2 (TX SWR_INPUT 0,1,2,3) + * WCD9395 TX Port 3 (DMIC0,1,2,3 & MBHC) <=> SWR2 Port 3 (TX SWR_INPUT 4,5,6,7) + * WCD9395 TX Port 4 (DMIC4,5,6,7) <=> SWR2 Port 4 (TX SWR_INPUT 8,9,10,11) + */ + qcom,tx-port-mapping = <2 2 3 4>; + }; +}; + &tlmm { /* Reserved I/Os for NFC */ gpio-reserved-ranges = <32 8>, <74 1>; @@ -790,6 +977,14 @@ mdp_vsync_suspend: mdp-vsync-suspend-state { bias-pull-down; }; + spkr_2_sd_n_active: spkr-2-sd-n-active-state { + pins = "gpio77"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; + ts_irq: ts-irq-state { pins = "gpio161"; function = "gpio"; @@ -804,6 +999,14 @@ ts_reset: ts-reset-state { drive-strength = <8>; bias-pull-up; }; + + wcd_default: wcd-reset-n-active-state { + pins = "gpio107"; + function = "gpio"; + drive-strength = <16>; + bias-disable; + output-low; + }; }; &uart14 { -- 2.34.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add Audio sound card node 2024-01-25 16:42 [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Neil Armstrong 2024-01-25 16:42 ` [PATCH 1/3] arm64: dts: qcom: sm8650-qrd: add Audio nodes Neil Armstrong @ 2024-01-25 16:42 ` Neil Armstrong 2024-01-25 16:42 ` [PATCH 3/3] arm64: defconfig: enable audio drivers for SM8650 QRD board Neil Armstrong 2024-02-07 4:46 ` (subset) [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Bjorn Andersson 3 siblings, 0 replies; 6+ messages in thread From: Neil Armstrong @ 2024-01-25 16:42 UTC (permalink / raw) To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-arm-msm, devicetree, linux-kernel, linux-arm-kernel, Neil Armstrong Add the sound card of SM8650-MTP board with the routing for Speakers. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 23 +++++++++++++++++++++++ 1 file changed, 23 insertions(+) diff --git a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts index be133a3d5cbe..d2ec0cfecba9 100644 --- a/arch/arm64/boot/dts/qcom/sm8650-mtp.dts +++ b/arch/arm64/boot/dts/qcom/sm8650-mtp.dts @@ -66,6 +66,29 @@ pmic_glink_ss_in: endpoint { }; }; + sound { + compatible = "qcom,sm8650-sndcard", "qcom,sm8450-sndcard"; + model = "SM8650-MTP"; + audio-routing = "SpkrLeft IN", "WSA_SPK1 OUT", + "SpkrRight IN", "WSA_SPK2 OUT"; + + 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>; + }; + }; + }; + vph_pwr: vph-pwr-regulator { compatible = "regulator-fixed"; -- 2.34.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH 3/3] arm64: defconfig: enable audio drivers for SM8650 QRD board 2024-01-25 16:42 [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Neil Armstrong 2024-01-25 16:42 ` [PATCH 1/3] arm64: dts: qcom: sm8650-qrd: add Audio nodes Neil Armstrong 2024-01-25 16:42 ` [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add Audio sound card node Neil Armstrong @ 2024-01-25 16:42 ` Neil Armstrong 2024-02-06 19:04 ` Konrad Dybcio 2024-02-07 4:46 ` (subset) [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Bjorn Andersson 3 siblings, 1 reply; 6+ messages in thread From: Neil Armstrong @ 2024-01-25 16:42 UTC (permalink / raw) To: Bjorn Andersson, Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-arm-msm, devicetree, linux-kernel, linux-arm-kernel, Neil Armstrong Enable the SM8650 LPASS driver and the WCD939x codec driver as module which are used to support Audio on the SM8650 QRD board. Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> --- arch/arm64/configs/defconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/arch/arm64/configs/defconfig b/arch/arm64/configs/defconfig index 5c8777fb5a29..d13d0fb8517a 100644 --- a/arch/arm64/configs/defconfig +++ b/arch/arm64/configs/defconfig @@ -620,6 +620,7 @@ CONFIG_PINCTRL_SM8350_LPASS_LPI=m CONFIG_PINCTRL_SM8450_LPASS_LPI=m CONFIG_PINCTRL_SC8280XP_LPASS_LPI=m CONFIG_PINCTRL_SM8550_LPASS_LPI=m +CONFIG_PINCTRL_SM8650_LPASS_LPI=m CONFIG_GPIO_ALTERA=m CONFIG_GPIO_DAVINCI=y CONFIG_GPIO_DWAPB=y @@ -992,6 +993,8 @@ CONFIG_SND_SOC_TLV320AIC32X4_I2C=m CONFIG_SND_SOC_TLV320AIC3X_I2C=m CONFIG_SND_SOC_WCD9335=m CONFIG_SND_SOC_WCD934X=m +CONFIG_SND_SOC_WCD939X=m +CONFIG_SND_SOC_WCD939X_SDW=m CONFIG_SND_SOC_WM8524=m CONFIG_SND_SOC_WM8904=m CONFIG_SND_SOC_WM8960=m -- 2.34.1 ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH 3/3] arm64: defconfig: enable audio drivers for SM8650 QRD board 2024-01-25 16:42 ` [PATCH 3/3] arm64: defconfig: enable audio drivers for SM8650 QRD board Neil Armstrong @ 2024-02-06 19:04 ` Konrad Dybcio 0 siblings, 0 replies; 6+ messages in thread From: Konrad Dybcio @ 2024-02-06 19:04 UTC (permalink / raw) To: Neil Armstrong, Bjorn Andersson, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon Cc: linux-arm-msm, devicetree, linux-kernel, linux-arm-kernel On 25.01.2024 17:42, Neil Armstrong wrote: > Enable the SM8650 LPASS driver and the WCD939x codec driver > as module which are used to support Audio on the SM8650 QRD board. > > Signed-off-by: Neil Armstrong <neil.armstrong@linaro.org> > --- Reviewed-by: Konrad Dybcio <konrad.dybcio@linaro.org> Konrad ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: (subset) [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD 2024-01-25 16:42 [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Neil Armstrong ` (2 preceding siblings ...) 2024-01-25 16:42 ` [PATCH 3/3] arm64: defconfig: enable audio drivers for SM8650 QRD board Neil Armstrong @ 2024-02-07 4:46 ` Bjorn Andersson 3 siblings, 0 replies; 6+ messages in thread From: Bjorn Andersson @ 2024-02-07 4:46 UTC (permalink / raw) To: Konrad Dybcio, Rob Herring, Krzysztof Kozlowski, Conor Dooley, Catalin Marinas, Will Deacon, Neil Armstrong Cc: linux-arm-msm, devicetree, linux-kernel, linux-arm-kernel On Thu, 25 Jan 2024 17:42:40 +0100, Neil Armstrong wrote: > Add the remaining Audio nodes on the SM8650-QRD & MTP boards including: > - Qualcomm Aqstic WCD9395 audio codec on the RX & TX Soundwire interfaces > - WSA8845 Left & Right Speakers > - Link the WCD9395 Codec node to the WCD9395 USB SubSystem node to handle > the USB-C Audio Accessory Mode events & lane swapping > - Sound card with routing for Speakers and Microphones > > [...] Applied, thanks! [1/3] arm64: dts: qcom: sm8650-qrd: add Audio nodes commit: ce745475acacfe159a358897e122e38b045f8008 [2/3] arm64: dts: qcom: sm8650-mtp: add Audio sound card node commit: 6e9d86933cab198d6d86ee19f4b81fd1732787b3 Best regards, -- Bjorn Andersson <andersson@kernel.org> ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2024-02-07 4:47 UTC | newest] Thread overview: 6+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2024-01-25 16:42 [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Neil Armstrong 2024-01-25 16:42 ` [PATCH 1/3] arm64: dts: qcom: sm8650-qrd: add Audio nodes Neil Armstrong 2024-01-25 16:42 ` [PATCH 2/3] arm64: dts: qcom: sm8650-mtp: add Audio sound card node Neil Armstrong 2024-01-25 16:42 ` [PATCH 3/3] arm64: defconfig: enable audio drivers for SM8650 QRD board Neil Armstrong 2024-02-06 19:04 ` Konrad Dybcio 2024-02-07 4:46 ` (subset) [PATCH 0/3] arm64: qcom: sm8650: enable Audio on MTP and QRD Bjorn Andersson
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox
all inboxes | Powered by JetHome®