[PATCH v2] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic

[PATCH v2] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic

[stefan.prisacariu]

From: Stefan Prisacariu <stefan.prisacariu@prevas.dk>

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 <stefan.prisacariu@prevas.dk>
Link: https://lore.kernel.org/all/20250925104942.4148376-1-stefan.prisacariu@prevas.dk/
---
v2: Updated git commit message to better explain the changes
v1: https://lore.kernel.org/all/20250925104942.4148376-1-stefan.prisacariu@prevas.dk/
---
 arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 1 +
 arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi         | 3 ---
 2 files changed, 1 insertion(+), 3 deletions(-)

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 18a620832a2a..a55644529c67 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 <dt-bindings/pwm/pwm.h>
 
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 59833e8d11d8..51bcaf04546b 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 <dt-bindings/clock/imx6qdl-clock.h>
 #include <dt-bindings/gpio/gpio.h>
 #include <dt-bindings/sound/fsl-imx-audmux.h>
-- 
2.47.2

Re: [PATCH v2] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic

[Shawn Guo]

On Wed, Nov 12, 2025 at 03:44:16PM +0100, stefan.prisacariu@prevas.dk wrote:
> From: Stefan Prisacariu <stefan.prisacariu@prevas.dk>
> 
> 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 <stefan.prisacariu@prevas.dk>
> Link: https://lore.kernel.org/all/20250925104942.4148376-1-stefan.prisacariu@prevas.dk/

Applied, thanks!