| Message ID | 20241018025452.1362293-1-alexey.klimov@linaro.org |
|---|---|
| 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
On Fri, 18 Oct 2024 03:54:46 +0100, Alexey Klimov wrote: > Rebased on top of -next, re-tested. > > Changes since v2: > -- added tags, updated commit messages, added Cc; > -- updated LT9611 -> LT9611UXC comment in qrb4210-rb2.dts; > -- updated addresses in DT to 8 hex digits as requested by Dmitry; > -- added lpass pinctrl to sm6115.dtsi as suggested by Dmitry; > -- added lpass pinctrl override and pins description to sm4250.dtsi, > pins are the property of sm4250; > -- verified with make dtbs_check as suggested by Krzysztof and Rob's bot. > -- dropped two patches (they seem to be merged): > [PATCH v2 1/7] ASoC: dt-bindings: qcom,sm8250: add qrb4210-rb2-sndcard > [PATCH v2 2/7] ASoC: qcom: sm8250: add qrb4210-rb2-sndcard compatible string > -- stopped Cc-ing out-of-date emails; > > [...] Applied to https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next Thanks! [1/5] ASoC: qcom: sm8250: add handling of secondary MI2S clock commit: ed7bca5b2b891caedf2ed3ffc427eba23559da95 All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark
Rebased on top of -next, re-tested. Changes since v2: -- added tags, updated commit messages, added Cc; -- updated LT9611 -> LT9611UXC comment in qrb4210-rb2.dts; -- updated addresses in DT to 8 hex digits as requested by Dmitry; -- added lpass pinctrl to sm6115.dtsi as suggested by Dmitry; -- added lpass pinctrl override and pins description to sm4250.dtsi, pins are the property of sm4250; -- verified with make dtbs_check as suggested by Krzysztof and Rob's bot. -- dropped two patches (they seem to be merged): [PATCH v2 1/7] ASoC: dt-bindings: qcom,sm8250: add qrb4210-rb2-sndcard [PATCH v2 2/7] ASoC: qcom: sm8250: add qrb4210-rb2-sndcard compatible string -- stopped Cc-ing out-of-date emails; URL to previous series: https://lore.kernel.org/linux-sound/20241002022015.867031-1-alexey.klimov@linaro.org/ Changes since v1: -- removed handling of MI2S clock in sm2450_snd_shutdown(): setting clock rate and disabling it causes audio delay on playback start; -- removed empty sound { } node from sm6115.dtsi as suggested by Krzysztof; -- moved lpi_i2s2_active pins description to qrb423310 board-specific file as suggested by Dmitry Baryshkov; -- moved q6asmdai DAIs to apr soc node as suggested by Konrad Dybcio; -- lpass_tlmm is not disabled; -- lpass_tlmm node moved to sm4250.dtsi; -- kept MultiMedia DAIs as is, without them the sound card driver doesn't initialise; -- added some reviewed-by tags. Alexey Klimov (5): ASoC: qcom: sm8250: add handling of secondary MI2S clock arm64: dts: qcom: sm6115: add apr and its services arm64: dts: qcom: sm6115: add LPASS LPI pin controller arm64: dts: qcom: sm4250: add LPASS LPI pin controller arm64: dts: qcom: qrb4210-rb2: add HDMI audio playback support arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 55 +++++++++++++++ arch/arm64/boot/dts/qcom/sm4250.dtsi | 39 +++++++++++ arch/arm64/boot/dts/qcom/sm6115.dtsi | 87 ++++++++++++++++++++++++ sound/soc/qcom/sm8250.c | 8 +++ 4 files changed, 189 insertions(+)