| Message ID | 20241018025452.1362293-6-alexey.klimov@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | rb4210-rb2: add HDMI audio playback support | expand |
On 18.10.2024 4:54 AM, Alexey Klimov wrote: > Add sound node and dsp-related piece to enable HDMI audio > playback support on Qualcomm QRB4210 RB2 board. That is the > only sound output supported for now. > > The audio playback is verified using the following commands: > > amixer -c0 cset iface=MIXER,name='SEC_MI2S_RX Audio Mixer MultiMedia1' 1 > aplay -D hw:0,0 /usr/share/sounds/alsa/Front_Center.wav > > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> > --- > arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 55 ++++++++++++++++++++++++ > 1 file changed, 55 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > index 1888d99d398b..5f671b9c8fb9 100644 > --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > @@ -6,6 +6,8 @@ > /dts-v1/; > > #include <dt-bindings/leds/common.h> > +#include <dt-bindings/sound/qcom,q6afe.h> > +#include <dt-bindings/sound/qcom,q6asm.h> > #include <dt-bindings/usb/pd.h> > #include "sm4250.dtsi" > #include "pm6125.dtsi" > @@ -103,6 +105,51 @@ led-wlan { > }; > }; > > + sound { > + compatible = "qcom,qrb4210-rb2-sndcard"; > + pinctrl-0 = <&lpi_i2s2_active>; > + pinctrl-names = "default"; > + model = "Qualcomm-RB2-WSA8815-Speakers-DMIC0"; > + audio-routing = "MM_DL1", "MultiMedia1 Playback", > + "MM_DL2", "MultiMedia2 Playback"; I'm seeing a lot of double spaces in this patch > + > + mm1-dai-link { > + link-name = "MultiMedia1"; > + cpu { Please add a newline between the subnode Looks nice otherwise Konrad
On Fri Oct 25, 2024 at 8:09 PM BST, Konrad Dybcio wrote: > On 18.10.2024 4:54 AM, Alexey Klimov wrote: > > Add sound node and dsp-related piece to enable HDMI audio > > playback support on Qualcomm QRB4210 RB2 board. That is the > > only sound output supported for now. > > > > The audio playback is verified using the following commands: > > > > amixer -c0 cset iface=MIXER,name='SEC_MI2S_RX Audio Mixer MultiMedia1' 1 > > aplay -D hw:0,0 /usr/share/sounds/alsa/Front_Center.wav > > > > Cc: Srinivas Kandagatla <srinivas.kandagatla@linaro.org> > > Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 55 ++++++++++++++++++++++++ > > 1 file changed, 55 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > > index 1888d99d398b..5f671b9c8fb9 100644 > > --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > > +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > > @@ -6,6 +6,8 @@ > > /dts-v1/; > > > > #include <dt-bindings/leds/common.h> > > +#include <dt-bindings/sound/qcom,q6afe.h> > > +#include <dt-bindings/sound/qcom,q6asm.h> > > #include <dt-bindings/usb/pd.h> > > #include "sm4250.dtsi" > > #include "pm6125.dtsi" > > @@ -103,6 +105,51 @@ led-wlan { > > }; > > }; > > > > + sound { > > + compatible = "qcom,qrb4210-rb2-sndcard"; > > + pinctrl-0 = <&lpi_i2s2_active>; > > + pinctrl-names = "default"; > > + model = "Qualcomm-RB2-WSA8815-Speakers-DMIC0"; > > + audio-routing = "MM_DL1", "MultiMedia1 Playback", > > + "MM_DL2", "MultiMedia2 Playback"; > > I'm seeing a lot of double spaces in this patch > > > + > > + mm1-dai-link { > > + link-name = "MultiMedia1"; > > + cpu { > > Please add a newline between the subnode > > Looks nice otherwise Thanks for noticing this! I'll update it and resend. I put one space between audio-routing widgets, not sure if even one is needed though, maybe there should be no space at all. Best regards, Alexey
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts index 1888d99d398b..5f671b9c8fb9 100644 --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts @@ -6,6 +6,8 @@ /dts-v1/; #include <dt-bindings/leds/common.h> +#include <dt-bindings/sound/qcom,q6afe.h> +#include <dt-bindings/sound/qcom,q6asm.h> #include <dt-bindings/usb/pd.h> #include "sm4250.dtsi" #include "pm6125.dtsi" @@ -103,6 +105,51 @@ led-wlan { }; }; + sound { + compatible = "qcom,qrb4210-rb2-sndcard"; + pinctrl-0 = <&lpi_i2s2_active>; + pinctrl-names = "default"; + model = "Qualcomm-RB2-WSA8815-Speakers-DMIC0"; + audio-routing = "MM_DL1", "MultiMedia1 Playback", + "MM_DL2", "MultiMedia2 Playback"; + + mm1-dai-link { + link-name = "MultiMedia1"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>; + }; + }; + + mm2-dai-link { + link-name = "MultiMedia2"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA2>; + }; + }; + + mm3-dai-link { + link-name = "MultiMedia3"; + cpu { + sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA3>; + }; + }; + + hdmi-dai-link { + link-name = "HDMI Playback"; + cpu { + sound-dai = <&q6afedai SECONDARY_MI2S_RX>; + }; + + platform { + sound-dai = <&q6routing>; + }; + + codec { + sound-dai = <<9611_codec 0>; + }; + }; + }; + vreg_hdmi_out_1p2: regulator-hdmi-out-1p2 { compatible = "regulator-fixed"; regulator-name = "VREG_HDMI_OUT_1P2"; @@ -318,6 +365,14 @@ &pon_resin { status = "okay"; }; +/* SECONDARY I2S uses 1 I2S SD Line for audio on LT9611UXC HDMI Bridge */ +&q6afedai { + dai@20 { + reg = <SECONDARY_MI2S_RX>; + qcom,sd-lines = <0>; + }; +}; + &qupv3_id_0 { status = "okay"; };