Re: [PATCH] arm64: dts: qcom: db820c: fix audio configuration

[Bjorn Andersson]

On Thu 14 May 06:43 PDT 2020, Vinod Koul wrote:

> On 17-04-20, 10:23, Srinivas Kandagatla wrote:
> > After patch f864edff110d ("ASoC: qdsp6: q6routing: remove default routing")
> > and 9b60441692d9 ("ASoC: qdsp6: q6asm-dai: only enable dais from device tree")
> > asm dais and routing needs to be properly specified at device tree level.
> > 
> > This patch fixes this.
> 
> Can we add the Fixes tag here please?
> 

Yes, I added that and picked this patch for 5.7-rc and sent out a pull
request. Unfortunately this does not seem to have been picked up yet.

> Other than that lgtm:
> 
> Reviewed-by: Vinod Koul <vkoul@xxxxxxxxxx>

Thanks

Regards,
Bjorn

> > Signed-off-by: Srinivas Kandagatla <srinivas.kandagatla@xxxxxxxxxx>
> > ---
> >  arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 22 +++++++++++++++++++-
> >  arch/arm64/boot/dts/qcom/msm8996.dtsi        |  2 ++
> >  2 files changed, 23 insertions(+), 1 deletion(-)
> > 
> > diff --git a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
> > index 4692b7ad16b7..cf217b6b2b39 100644
> > --- a/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi
> > @@ -908,10 +908,30 @@
> >  	status = "okay";
> >  };
> >  
> > +&q6asmdai {
> > +	dai@0 {
> > +		reg = <0>;
> > +		direction = <2>;
> > +	};
> > +
> > +	dai@1 {
> > +		reg = <1>;
> > +		direction = <2>;
> > +	};
> > +
> > +	dai@2 {
> > +		reg = <2>;
> > +		direction = <1>;
> > +	};
> > +};
> > +
> >  &sound {
> >  	compatible = "qcom,apq8096-sndcard";
> >  	model = "DB820c";
> > -	audio-routing =	"RX_BIAS", "MCLK";
> > +	audio-routing =	"RX_BIAS", "MCLK",
> > +		"MM_DL1",  "MultiMedia1 Playback",
> > +		"MM_DL2",  "MultiMedia2 Playback",
> > +		"MultiMedia3 Capture", "MM_UL3";
> >  
> >  	mm1-dai-link {
> >  		link-name = "MultiMedia1";
> > diff --git a/arch/arm64/boot/dts/qcom/msm8996.dtsi b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > index 14827adebd94..98634d5c4440 100644
> > --- a/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > +++ b/arch/arm64/boot/dts/qcom/msm8996.dtsi
> > @@ -2066,6 +2066,8 @@
> >  						reg = <APR_SVC_ASM>;
> >  						q6asmdai: dais {
> >  							compatible = "qcom,q6asm-dais";
> > +							#address-cells = <1>;
> > +							#size-cells = <0>;
> >  							#sound-dai-cells = <1>;
> >  							iommus = <&lpass_q6_smmu 1>;
> >  						};
> > -- 
> > 2.21.0
> 
> -- 
> ~Vinod