From: Stefan Prisacariu Date: Wed, 12 Nov 2025 14:44:16 +0000 (+0100) Subject: ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic X-Git-Url: http://git.ipfire.org/?a=commitdiff_plain;h=6f813b7814d305cac27b81d5cabe3ebdebd1d8f2;p=thirdparty%2Flinux.git ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic Make SoM .dtsi SoC-agnostic by moving SoC include to board level imx6qdl-var-som.dtsi currently includes imx6q.dtsi, which makes this SoM description Quad/Dual specific and prevents reuse from i.MX6DL boards. Changes: - Move imx6q.dtsi include from imx6qdl-var-som.dtsi to imx6q-var-mx6customboard.dts. - Remove /dts-v1/; from imx6qdl-var-som.dtsi (dtsi files should not declare version) This keeps the SoM .dtsi SoC-agnostic (it already relies on imx6qdl.dtsi for family-common parts) and allows boards using the DualLite or Solo to include imx6dl.dtsi instead. Why this is needed: To reuse imx6qdl-var-som.dtsi on i.MX6DL board. No functional changes for imx6q-var-mx6customboard are intended. Signed-off-by: Stefan Prisacariu Link: https://lore.kernel.org/all/20250925104942.4148376-1-stefan.prisacariu@prevas.dk/ Signed-off-by: Shawn Guo --- diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts index 18a620832a2ad..a55644529c67f 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts +++ b/arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts @@ -8,6 +8,7 @@ /dts-v1/; +#include "imx6q.dtsi" #include "imx6qdl-var-som.dtsi" #include diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi index 2bff5f92242ac..fef34ce961d5f 100644 --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi +++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi @@ -9,9 +9,6 @@ * Copyright 2022 Bootlin */ -/dts-v1/; - -#include "imx6q.dtsi" #include #include #include