Re: [PATCH v3 1/3] arm64: dts: qcom: x1e80100-hp-omnibook-x14: add sound label and pull out the model

[Dmitry Baryshkov]

On Sat, Apr 26, 2025 at 09:45:15AM +0200, Juerg Haefliger wrote:
> On Fri, 25 Apr 2025 22:44:42 +0300
> Dmitry Baryshkov <dmitry.baryshkov@xxxxxxxxxxxxxxxx> wrote:
> 
> > On Wed, Apr 16, 2025 at 11:42:34AM +0200, Juerg Haefliger wrote:
> > > Add a label to the sound node and pull out the model name to make it
> > > explicit and easier to override it from other nodes.
> > > 
> > > Signed-off-by: Juerg Haefliger <juerg.haefliger@xxxxxxxxxxxxx>
> > > ---
> > >  arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts | 7 +++++--
> > >  1 file changed, 5 insertions(+), 2 deletions(-)
> > > 
> > > diff --git a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
> > > index cd860a246c45..9595ced8b2cc 100644
> > > --- a/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
> > > +++ b/arch/arm64/boot/dts/qcom/x1e80100-hp-omnibook-x14.dts
> > > @@ -174,9 +174,8 @@ linux,cma {
> > >  		};
> > >  	};
> > >  
> > > -	sound {
> > > +	sound: sound {
> > >  		compatible = "qcom,x1e80100-sndcard";
> > > -		model = "X1E80100-HP-OMNIBOOK-X14";
> > >  		audio-routing = "SpkrLeft IN", "WSA WSA_SPK1 OUT",
> > >  				"SpkrRight IN", "WSA WSA_SPK2 OUT",
> > >  				"IN1_HPHL", "HPHL_OUT",
> > > @@ -1691,3 +1690,7 @@ &usb_mp_qmpphy0 {
> > >  
> > >  	status = "okay";
> > >  };
> > > +
> > > +&sound {
> > > +	model = "X1E80100-HP-OMNIBOOK-X14";
> > > +};  
> > 
> > Usually the DT don't use this idea. Could you please bring the model
> > back to the node? The label is fine.
> 
> Hm. Maybe I misunderstood but isn't that what Krzysztof requested here?
> https://lore.kernel.org/linux-arm-msm/bb95af7c-5e88-4c6a-87db-2ddd1fe211a5@xxxxxxxxxx/

In the override, yes.

So, in this file you should still have:


/ {
	sound: sound {
		model = "foo bar baz";
		other-props;
	};
};

in the DT overlay (dtso):

&sound {
	model = "other model";
};

Another, more common option:

base.dtsi:

/ {
	sound: sound {
		other-props;
	};
};

one.dts:

#include "base.dtsi"
&sound {
		model = "foo bar baz";
};

two.dts:

#include "base.dtsi"
&sound {
	model = "other model";
};

> 
> ...Juerg
> 
> 
> > 
> > > -- 
> > > 2.43.0
> > >   
> > 
> 



-- 
With best wishes
Dmitry