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

lists.openwall.net		lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC
Open Source and information security mailing list archives

Hash Suite: Windows password security audit tool. GUI, reports in PDF.

[<prev] [next>] [day] [month] [year] [list]

Message-ID: <20250925104942.4148376-1-stefan.prisacariu@prevas.dk>
Date: Thu, 25 Sep 2025 12:49:40 +0200
From: <stefan.prisacariu@...vas.dk>
To: Rob Herring <robh@...nel.org>,
	Krzysztof Kozlowski <krzk+dt@...nel.org>,
	Conor Dooley <conor+dt@...nel.org>,
	Shawn Guo <shawnguo@...nel.org>,
	Sascha Hauer <s.hauer@...gutronix.de>,
	Pengutronix Kernel Team <kernel@...gutronix.de>,
	Fabio Estevam <festevam@...il.com>,
	devicetree@...r.kernel.org,
	imx@...ts.linux.dev,
	linux-arm-kernel@...ts.infradead.org,
	linux-kernel@...r.kernel.org
Cc: Stefan Prisacariu <stefan.prisacariu@...vas.dk>
Subject: [PATCH] ARM: dts: imx6qdl: make VAR-SOM SoM SoC-agnostic

From: Stefan Prisacariu <stefan.prisacariu@...vas.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.

Move the SoC selection to the board level:
 - Drop the imx6q.dtsi include from the SoM .dtsi.
 - Add imx6q.dtsi include to imx6q-var-mx6customboard.dts.

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:
I need to reuse imx6qdl-var-som.dtsi for a board based on i.MX6DL
(VAR-SOM SoM + custom carrier). Without this change, the SoM .dtsi
forces imx6q.dtsi, which is incorrect for DL and breaks the layering
model used upstream.

Verification:
The DTB for imx6q-var-mx6customboard was rebuilt before and after this
change. Both the binary DTB and the decompiled DTS
(via dtc -I dtb -O dts -s) are identical, confirming no functional change
for the existing board.

Alignment:
This also aligns the layering with how it is already done for
imx6q-var-dt6customboard.dts, where the SoC include is handled at the
board level.

No functional changes for imx6q-var-mx6customboard are intended.

Files were introduced in:
commit e5c810848d2a ("ARM: dts: imx6qdl: Add Variscite VAR-SOM-MX6
SoM support")
commit a5b59a3f41bd ("ARM: dts: imx6q: Add Variscite MX6 Custom board
support")

Signed-off-by: Stefan Prisacariu <stefan.prisacariu@...vas.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>

base-commit: 8f5ff9784f3262e6e85c68d86f8b7931827f2983
-- 
2.49.1