Re: [PATCH DNM 2/2] arm64: dts: qcom: qcm6490-fairphone-fp5: Add DisplayPort sound support

[Luca Weiss]

On Tue May 28, 2024 at 11:35 PM CEST, Bjorn Andersson wrote:
> On Fri, May 10, 2024 at 02:27:09PM GMT, Luca Weiss wrote:
> > Add the required nodes for sound playback via a connected external
> > display (DisplayPort over USB-C).
> > 
> > Signed-off-by: Luca Weiss <luca.weiss@xxxxxxxxxxxxx>
> > ---
> > Depends on a bunch of patches upstream doing bringup of Display (DSI),
> > DisplayPort, GPU, and then finally audio could land. But we're blocked
> > on DPU 1:1:1 topology for all of that unfortunately.
> > 
> > And also machine driver for sound just exists a bit hackily.
>
> Thanks for sharing this, Luca. Can you please resubmit this once it's
> ready to be merged, so that I don't need to keep track of it?

Definitely, though I don't expect it to be soon unfortunately, maybe you
can ask your colleagues though to fix that DPU 1:1:1 topology ;)

>
> Regards,
> Bjorn
>
> > ---
> >  arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 36 ++++++++++++++++++++++
> >  1 file changed, 36 insertions(+)
> > 
> > diff --git a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
> > index 05bbf1da5cb8..2bbbcaeff95e 100644
> > --- a/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
> > +++ b/arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts
> > @@ -14,6 +14,8 @@
> >  #include <dt-bindings/leds/common.h>
> >  #include <dt-bindings/pinctrl/qcom,pmic-gpio.h>
> >  #include <dt-bindings/regulator/qcom,rpmh-regulator.h>
> > +#include <dt-bindings/sound/qcom,q6afe.h>
> > +#include <dt-bindings/sound/qcom,q6asm.h>
> >  #include "sc7280.dtsi"
> >  #include "pm7250b.dtsi"
> >  #include "pm7325.dtsi"
> > @@ -774,6 +776,12 @@ &pon_resin {
> >  	status = "okay";
> >  };
> >  
> > +&q6afedai {
> > +	dai@104 {
> > +		reg = <DISPLAY_PORT_RX>;
> > +	};
> > +};
> > +
> >  &qup_spi13_cs {
> >  	drive-strength = <6>;
> >  	bias-disable;
> > @@ -847,6 +855,34 @@ &sdhc_2 {
> >  	status = "okay";
> >  };
> >  
> > +&sound {
> > +	compatible = "fairphone,fp5-sndcard";
> > +	model = "Fairphone 5";
> > +
> > +	mm1-dai-link {
> > +		link-name = "MultiMedia1";
> > +		cpu {
> > +			sound-dai = <&q6asmdai MSM_FRONTEND_DAI_MULTIMEDIA1>;
> > +		};
> > +	};
> > +
> > +	displayport-rx-dai-link {
> > +		link-name = "DisplayPort Playback";
> > +
> > +		cpu {
> > +			sound-dai = <&q6afedai DISPLAY_PORT_RX>;
> > +		};
> > +
> > +		platform {
> > +			sound-dai = <&q6routing>;
> > +		};
> > +
> > +		codec {
> > +			sound-dai = <&mdss_dp>;
> > +		};
> > +	};
> > +};
> > +
> >  &spi13 {
> >  	status = "okay";
> >  
> > 
> > -- 
> > 2.45.0
> >