[PATCH] ARM: dts: nxp/imx6: Fix imx6qdl pico dwarf and nymph includes

From
Rob Herring (Arm) <robh@kernel.org>
Date
2026-11-09 16:18:21
Also in
imx, linux-arm-kernel, lkml, stable
The imx6q/dl pico dwarf and nymph boards appear to have a copy-n-paste
error including the imx6qdl-pico-pi.dtsi by mistake. The
imx6qdl-pico-dwarf.dtsi and imx6qdl-pico-nymph.dtsi were otherwise unused.

Fixing the typos introduces some DT schema warnings, so fix them. The
supplies for MPL3115 are a guess based on other dwarf variants.

Reported-by: sashiko-bot@kernel.org
Link: https://lore.kernel.org/all/sashiko-outbox-199279@kernel.org (local)
Fixes: 98670a0bb0ef ("ARM: dts: imx6qdl: Add imx6qdl-pico support")
Cc: <redacted>
Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
 arch/arm/boot/dts/nxp/imx/imx6dl-pico-dwarf.dts   | 2 +-
 arch/arm/boot/dts/nxp/imx/imx6dl-pico-nymph.dts   | 2 +-
 arch/arm/boot/dts/nxp/imx/imx6q-pico-dwarf.dts    | 2 +-
 arch/arm/boot/dts/nxp/imx/imx6q-pico-nymph.dts    | 2 +-
 arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi | 3 +++
 arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi | 1 +
 6 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-pico-dwarf.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-pico-dwarf.dts
index d85b15a8c127..dd8ce2df876c 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-pico-dwarf.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-pico-dwarf.dts
@@ -9,7 +9,7 @@
 /dts-v1/;
 
 #include "imx6dl.dtsi"
-#include "imx6qdl-pico-pi.dtsi"
+#include "imx6qdl-pico-dwarf.dtsi"
 
 / {
 	model = "TechNexion PICO-IMX6 DualLite/Solo Board and Dwarf baseboard";
diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-pico-nymph.dts b/arch/arm/boot/dts/nxp/imx/imx6dl-pico-nymph.dts
index 32ccfc5d41ce..4ce0d0d0756c 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-pico-nymph.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6dl-pico-nymph.dts
@@ -9,7 +9,7 @@
 /dts-v1/;
 
 #include "imx6dl.dtsi"
-#include "imx6qdl-pico-pi.dtsi"
+#include "imx6qdl-pico-nymph.dtsi"
 
 / {
 	model = "TechNexion PICO-IMX6 DualLite/Solo Board and Nymph baseboard";
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-pico-dwarf.dts b/arch/arm/boot/dts/nxp/imx/imx6q-pico-dwarf.dts
index 479a63ed42af..5e1f8b79593d 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-pico-dwarf.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-pico-dwarf.dts
@@ -9,7 +9,7 @@
 /dts-v1/;
 
 #include "imx6q.dtsi"
-#include "imx6qdl-pico-pi.dtsi"
+#include "imx6qdl-pico-dwarf.dtsi"
 
 / {
 	model = "TechNexion PICO-IMX6 Quad Board and Dwarf baseboard";
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-pico-nymph.dts b/arch/arm/boot/dts/nxp/imx/imx6q-pico-nymph.dts
index e8ad4c12b263..d688b5bb6c6a 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6q-pico-nymph.dts
+++ b/arch/arm/boot/dts/nxp/imx/imx6q-pico-nymph.dts
@@ -9,7 +9,7 @@
 /dts-v1/;
 
 #include "imx6q.dtsi"
-#include "imx6qdl-pico-pi.dtsi"
+#include "imx6qdl-pico-nymph.dtsi"
 
 / {
 	model = "TechNexion PICO-IMX6 Quad Board and Nymph baseboard";
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
index 3a968782e854..feaadacfe7ff 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
@@ -22,6 +22,8 @@ &i2c1 {
 	mpl3115@60 {
 		compatible = "fsl,mpl3115";
 		reg = <0x60>;
+		vdd-supply = <&reg_3p3v>;
+		vddio-supply = <&reg_3p3v>;
 	};
 };
 
@@ -31,6 +33,7 @@ io-expander@25 {
 		reg = <0x25>;
 		gpio-controller;
 		#gpio-cells = <2>;
+		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
index 3d56a4216448..a13f4d49c05d 100644
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
+++ b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
@@ -30,6 +30,7 @@ io-expander@25 {
 		reg = <0x25>;
 		gpio-controller;
 		#gpio-cells = <2>;
+		interrupt-controller;
 		#interrupt-cells = <2>;
 	};
 };
-- 
2.53.0
Thread (3 messages) 3 messages, 2 authors, last reply 10h ago
Keyboard shortcuts
hback out one level
jnext message in thread / next series-diff position
kprevious message in thread / previous series-diff position
ldrill in
Escclose help / fold thread tree
?toggle this help