| Message ID | 20240628010715.438471-8-alexey.klimov@linaro.org (mailing list archive) |
|---|---|
| State | New, archived |
| Headers | show |
| Series | qrb4210-rb2: add HDMI audio playback support | expand |
On 28/06/2024 03:07, Alexey Klimov wrote: > Add sound node, dsp-related pieces and LPASS pinctrl to enable > HDMI audio support on Qualcomm QRB4210 RB2 board. That is the > only sound output supported for now. > > Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> > --- > arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 73 ++++++++++++++++++++++++ > 1 file changed, 73 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > index 2c39bb1b97db..9f4dde927be4 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" > @@ -230,6 +232,10 @@ lt9611_out: endpoint { > }; > }; > > +&lpass_tlmm { > + status = "okay"; Why LPASS TLMM was disabled? I do not see any missing resource. Drop. Best regards, Krzysztof
On Fri, Jun 28, 2024 at 02:07:15AM GMT, Alexey Klimov wrote: > Add sound node, dsp-related pieces and LPASS pinctrl to enable > HDMI audio support on Qualcomm QRB4210 RB2 board. That is the > only sound output supported for now. I see that you have also added the MultiMedia DAIs, which don't seem to be used with this patch. > > Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> > --- > arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 73 ++++++++++++++++++++++++ > 1 file changed, 73 insertions(+) > > +&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>; > + }; > + }; > +}; > + > &tlmm { > gpio-reserved-ranges = <43 2>, <49 1>, <54 1>, > <56 3>, <61 2>, <64 1>, > -- > 2.45.2 >
On 28.06.2024 3:07 AM, Alexey Klimov wrote: > Add sound node, dsp-related pieces and LPASS pinctrl to enable > HDMI audio support on Qualcomm QRB4210 RB2 board. That is the > only sound output supported for now. > > Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> > --- [...] > +&q6asmdai { > + dai@0 { > + reg = <0>; > + }; > + > + dai@1 { > + reg = <1>; > + }; > + > + dai@2 { > + reg = <2>; > + }; Should these DAIs be moved to the SoC node? Konrad
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts index 2c39bb1b97db..9f4dde927be4 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" @@ -230,6 +232,10 @@ lt9611_out: endpoint { }; }; +&lpass_tlmm { + status = "okay"; +}; + &mdss { status = "okay"; }; @@ -307,6 +313,28 @@ &pon_resin { status = "okay"; }; +&q6asmdai { + dai@0 { + reg = <0>; + }; + + dai@1 { + reg = <1>; + }; + + dai@2 { + reg = <2>; + }; +}; + +/* SECONDARY I2S Uses 1 I2S SD Lines for audio on LT9611 HDMI Bridge */ +&q6afedai { + dai@20 { + reg = <SECONDARY_MI2S_RX>; + qcom,sd-lines = <0>; + }; +}; + &qupv3_id_0 { status = "okay"; }; @@ -535,6 +563,51 @@ &sleep_clk { clock-frequency = <32000>; }; +&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>; + }; + }; +}; + &tlmm { gpio-reserved-ranges = <43 2>, <49 1>, <54 1>, <56 3>, <61 2>, <64 1>,
Add sound node, dsp-related pieces and LPASS pinctrl to enable HDMI audio support on Qualcomm QRB4210 RB2 board. That is the only sound output supported for now. Signed-off-by: Alexey Klimov <alexey.klimov@linaro.org> --- arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 73 ++++++++++++++++++++++++ 1 file changed, 73 insertions(+)