]> git.ipfire.org Git - thirdparty/linux.git/commitdiff
ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic
authorStefan Prisacariu <stefan.prisacariu@prevas.dk>
Wed, 12 Nov 2025 14:44:16 +0000 (15:44 +0100)
committerShawn Guo <shawnguo@kernel.org>
Sun, 16 Nov 2025 13:03:49 +0000 (21:03 +0800)
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/
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts
arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi

index 18a620832a2ad358d54554867a3a715624635ff6..a55644529c67feac6751e9979a6c8048569ff950 100644 (file)
@@ -8,6 +8,7 @@
 
 /dts-v1/;
 
+#include "imx6q.dtsi"
 #include "imx6qdl-var-som.dtsi"
 #include <dt-bindings/pwm/pwm.h>
 
index 2bff5f92242ac632952311e3b3bb1af9ca2c140d..fef34ce961d5f87c7230933849b7cade2d0a8614 100644 (file)
@@ -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>