On dinsdag 28 januari 2025 09:07:29 Midden-Europese standaardtijd Stephan Gerhold wrote: > On Mon, Jan 27, 2025 at 11:45:43PM +0100, Luca Weiss wrote: > > MSM8926, while being 'just' an LTE-capable variant of MSM8226, the dts > > needs to slightly change since the modem doesn't use the ext-bhs-reg and > > needs mss-supply, therefore it gets a new compatible. > > > > Since we already have two -common.dtsi files which are used on both > > APQ8026/MSM8226 and MSM8926 devices, change the setup a bit by removing > > the SoC include from those and requiring the device dts to pick the > > correct one. > > > > Signed-off-by: Luca Weiss <luca@xxxxxxxxxxxx> > > --- > > arch/arm/boot/dts/qcom/msm8926.dtsi | 11 ++++++ +++++ > > arch/arm/boot/dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 1 + > > arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi | 6 +++++- > > arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts | 1 + > > arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts | 1 + > > arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts | 1 + > > .../boot/dts/qcom/qcom-msm8226-samsung-matisse-common.dtsi | 6 +++++- > > arch/arm/boot/dts/qcom/qcom-msm8926-htc-memul.dts | 2 +- > > .../arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts | 1 + > > arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts | 1 + > > arch/arm/boot/dts/qcom/qcom-msm8926-motorola-peregrine.dts | 2 +- > > arch/arm/boot/dts/qcom/qcom-msm8926-samsung-matisselte.dts | 1 + > > 12 files changed, 30 insertions(+), 4 deletions(-) > > > > diff --git a/arch/arm/boot/dts/qcom/msm8926.dtsi b/arch/arm/boot/dts/qcom/ msm8926.dtsi > > I'm personally not a big fan of mixing the naming with and without qcom- > prefix. But anyway: Same, but already all PMICs were renamed to get rid of the pmXXXX- prefix, and there's even some new dts files that don't have the qcom- prefix anymore. I can also send a patch to rename the .dtsi files to remove the prefix to be at least consistent with the PMICs, and the .dts files we'd need to keep with the original name to not cause any issues with the users of those - even though there have also been plenty of cases where we renamed those. Regards Luca
