[PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[Rob Herring (Arm)]

These .dtsi files are not included anywhere in the tree and can't be
tested.

Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
---
v2:
 - Rebased

It's been nearly a year and these are still orphans. There was a promise
to upstream something for the kontron ones, but that hasn't happened.

 .../dts/nxp/imx/imx6dl-kontron-samx6i.dtsi    | 12 -----
 .../dts/nxp/imx/imx6q-kontron-samx6i.dtsi     | 12 -----
 .../boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi  | 45 ----------------
 .../boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi  | 54 -------------------
 4 files changed, 123 deletions(-)
 delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi
 delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi
 delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
 delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi

diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi
deleted file mode 100644
index 5a9b819d7ee8..000000000000
--- a/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
-/*
- * Copyright 2019 (C) Pengutronix, Marco Felsch <kernel@pengutronix.de>
- */
-
-#include "imx6dl.dtsi"
-#include "imx6qdl-kontron-samx6i.dtsi"
-
-/ {
-	model = "Kontron SMARC-sAMX6i Dual-Lite/Solo";
-	compatible = "kontron,imx6dl-samx6i", "fsl,imx6dl";
-};
diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi
deleted file mode 100644
index e76963436079..000000000000
--- a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi
+++ /dev/null
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
-/*
- * Copyright 2019 (C) Pengutronix, Marco Felsch <kernel@pengutronix.de>
- */
-
-#include "imx6q.dtsi"
-#include "imx6qdl-kontron-samx6i.dtsi"
-
-/ {
-	model = "Kontron SMARC-sAMX6i Quad/Dual";
-	compatible = "kontron,imx6q-samx6i", "fsl,imx6q";
-};
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
deleted file mode 100644
index 3a968782e854..000000000000
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
+++ /dev/null
@@ -1,45 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-//
-// Copyright 2017 NXP
-
-#include "imx6qdl-pico.dtsi"
-
-/ {
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpio_leds>;
-
-		led {
-			label = "gpio-led";
-			gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-};
-
-&i2c1 {
-	mpl3115@60 {
-		compatible = "fsl,mpl3115";
-		reg = <0x60>;
-	};
-};
-
-&i2c2 {
-	io-expander@25 {
-		compatible = "nxp,pca9554";
-		reg = <0x25>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		#interrupt-cells = <2>;
-	};
-
-};
-
-&iomuxc {
-	pinctrl_gpio_leds: gpioledsgrp {
-		fsl,pins = <
-			MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31	0x1b0b0
-		>;
-	};
-};
diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
deleted file mode 100644
index 3d56a4216448..000000000000
--- a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
+++ /dev/null
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-
-#include "imx6qdl-pico.dtsi"
-
-/ {
-	leds {
-		compatible = "gpio-leds";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpio_leds>;
-
-		led {
-			label = "gpio-led";
-			gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;
-		};
-	};
-
-};
-
-&i2c1 {
-	adc@52 {
-		compatible = "ti,adc081c";
-		reg = <0x52>;
-		vref-supply = <&reg_2p5v>;
-	};
-};
-
-&i2c2 {
-	io-expander@25 {
-		compatible = "nxp,pca9554";
-		reg = <0x25>;
-		gpio-controller;
-		#gpio-cells = <2>;
-		#interrupt-cells = <2>;
-	};
-};
-
-&i2c3 {
-	rtc@68 {
-		compatible = "dallas,ds1337";
-		reg = <0x68>;
-	};
-};
-
-&pcie {
-	status = "okay";
-};
-
-&iomuxc {
-	pinctrl_gpio_leds: gpioledsgrp {
-		fsl,pins = <
-			MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31	0x1b0b0
-		>;
-	};
-};
-- 
2.53.0

Re: [PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[Marco Felsch]

On 26-11-05 08:49, Rob Herring (Arm) wrote:
> These .dtsi files are not included anywhere in the tree and can't be
> tested.
> 
> Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> ---
> v2:
>  - Rebased
> 
> It's been nearly a year and these are still orphans. There was a promise
> to upstream something for the kontron ones, but that hasn't happened.

That's unfortunate, but these includes are used at least by the barebox
bootloader [1,2], dropping these would cause a DT regresssion.

Would it help to upstream [1,2]?

Regards,
  Marco

[1] https://elixir.bootlin.com/barebox/v2026.10.0/source/arch/arm/dts/imx6dl-samx6i.dts#L8
[2] https://elixir.bootlin.com/barebox/v2026.10.0/source/arch/arm/dts/imx6q-samx6i.dts#L8

> 
>  .../dts/nxp/imx/imx6dl-kontron-samx6i.dtsi    | 12 -----
>  .../dts/nxp/imx/imx6q-kontron-samx6i.dtsi     | 12 -----
>  .../boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi  | 45 ----------------
>  .../boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi  | 54 -------------------
>  4 files changed, 123 deletions(-)
>  delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi
>  delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi
>  delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
>  delete mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
> 
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi
> deleted file mode 100644
> index 5a9b819d7ee8..000000000000
> --- a/arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0 OR X11
> -/*
> - * Copyright 2019 (C) Pengutronix, Marco Felsch <kernel@pengutronix.de>
> - */
> -
> -#include "imx6dl.dtsi"
> -#include "imx6qdl-kontron-samx6i.dtsi"
> -
> -/ {
> -	model = "Kontron SMARC-sAMX6i Dual-Lite/Solo";
> -	compatible = "kontron,imx6dl-samx6i", "fsl,imx6dl";
> -};
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi b/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi
> deleted file mode 100644
> index e76963436079..000000000000
> --- a/arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi
> +++ /dev/null
> @@ -1,12 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0 OR X11
> -/*
> - * Copyright 2019 (C) Pengutronix, Marco Felsch <kernel@pengutronix.de>
> - */
> -
> -#include "imx6q.dtsi"
> -#include "imx6qdl-kontron-samx6i.dtsi"
> -
> -/ {
> -	model = "Kontron SMARC-sAMX6i Quad/Dual";
> -	compatible = "kontron,imx6q-samx6i", "fsl,imx6q";
> -};
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
> deleted file mode 100644
> index 3a968782e854..000000000000
> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi
> +++ /dev/null
> @@ -1,45 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+ OR MIT
> -//
> -// Copyright 2017 NXP
> -
> -#include "imx6qdl-pico.dtsi"
> -
> -/ {
> -	leds {
> -		compatible = "gpio-leds";
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&pinctrl_gpio_leds>;
> -
> -		led {
> -			label = "gpio-led";
> -			gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;
> -		};
> -	};
> -
> -};
> -
> -&i2c1 {
> -	mpl3115@60 {
> -		compatible = "fsl,mpl3115";
> -		reg = <0x60>;
> -	};
> -};
> -
> -&i2c2 {
> -	io-expander@25 {
> -		compatible = "nxp,pca9554";
> -		reg = <0x25>;
> -		gpio-controller;
> -		#gpio-cells = <2>;
> -		#interrupt-cells = <2>;
> -	};
> -
> -};
> -
> -&iomuxc {
> -	pinctrl_gpio_leds: gpioledsgrp {
> -		fsl,pins = <
> -			MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31	0x1b0b0
> -		>;
> -	};
> -};
> diff --git a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi b/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
> deleted file mode 100644
> index 3d56a4216448..000000000000
> --- a/arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi
> +++ /dev/null
> @@ -1,54 +0,0 @@
> -// SPDX-License-Identifier: GPL-2.0+ OR MIT
> -
> -#include "imx6qdl-pico.dtsi"
> -
> -/ {
> -	leds {
> -		compatible = "gpio-leds";
> -		pinctrl-names = "default";
> -		pinctrl-0 = <&pinctrl_gpio_leds>;
> -
> -		led {
> -			label = "gpio-led";
> -			gpios = <&gpio5 31 GPIO_ACTIVE_HIGH>;
> -		};
> -	};
> -
> -};
> -
> -&i2c1 {
> -	adc@52 {
> -		compatible = "ti,adc081c";
> -		reg = <0x52>;
> -		vref-supply = <&reg_2p5v>;
> -	};
> -};
> -
> -&i2c2 {
> -	io-expander@25 {
> -		compatible = "nxp,pca9554";
> -		reg = <0x25>;
> -		gpio-controller;
> -		#gpio-cells = <2>;
> -		#interrupt-cells = <2>;
> -	};
> -};
> -
> -&i2c3 {
> -	rtc@68 {
> -		compatible = "dallas,ds1337";
> -		reg = <0x68>;
> -	};
> -};
> -
> -&pcie {
> -	status = "okay";
> -};
> -
> -&iomuxc {
> -	pinctrl_gpio_leds: gpioledsgrp {
> -		fsl,pins = <
> -			MX6QDL_PAD_CSI0_DAT13__GPIO5_IO31	0x1b0b0
> -		>;
> -	};
> -};
> -- 
> 2.53.0
> 

Re: [PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[Rob Herring]

On Thu, Nov 5, 2026 at 9:00 AM Marco Felsch <m.felsch@pengutronix.de> wrote:
>
> On 26-11-05 08:49, Rob Herring (Arm) wrote:
> > These .dtsi files are not included anywhere in the tree and can't be
> > tested.
> >
> > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > ---
> > v2:
> >  - Rebased
> >
> > It's been nearly a year and these are still orphans. There was a promise
> > to upstream something for the kontron ones, but that hasn't happened.
>
> That's unfortunate, but these includes are used at least by the barebox
> bootloader [1,2], dropping these would cause a DT regresssion.
>
> Would it help to upstream [1,2]?

You said you were going to do that on v1:

>> I will add the som.dts, please don't remove the kontron dtsi files yet.

Re: [PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[Marco Felsch]

On 26-11-05 09:06, Rob Herring wrote:
> On Thu, Nov 5, 2026 at 9:00 AM Marco Felsch <m.felsch@pengutronix.de> wrote:
> >
> > On 26-11-05 08:49, Rob Herring (Arm) wrote:
> > > These .dtsi files are not included anywhere in the tree and can't be
> > > tested.
> > >
> > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > > ---
> > > v2:
> > >  - Rebased
> > >
> > > It's been nearly a year and these are still orphans. There was a promise
> > > to upstream something for the kontron ones, but that hasn't happened.
> >
> > That's unfortunate, but these includes are used at least by the barebox
> > bootloader [1,2], dropping these would cause a DT regresssion.
> >
> > Would it help to upstream [1,2]?
> 
> You said you were going to do that on v1:

Unfortunate no Kontron dev was chiming in. Will do it now!

Regards,
  Marco

> 
> >> I will add the som.dts, please don't remove the kontron dtsi files yet.

Re: [PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[Marco Felsch]

On 26-11-05 16:09, Marco Felsch wrote:
> On 26-11-05 09:06, Rob Herring wrote:
> > On Thu, Nov 5, 2026 at 9:00 AM Marco Felsch <m.felsch@pengutronix.de> wrote:
> > >
> > > On 26-11-05 08:49, Rob Herring (Arm) wrote:
> > > > These .dtsi files are not included anywhere in the tree and can't be
> > > > tested.
> > > >
> > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > > > ---
> > > > v2:
> > > >  - Rebased
> > > >
> > > > It's been nearly a year and these are still orphans. There was a promise
> > > > to upstream something for the kontron ones, but that hasn't happened.
> > >
> > > That's unfortunate, but these includes are used at least by the barebox
> > > bootloader [1,2], dropping these would cause a DT regresssion.
> > >
> > > Would it help to upstream [1,2]?
> > 
> > You said you were going to do that on v1:
> 
> Unfortunate no Kontron dev was chiming in. Will do it now!

Okay, after checking the current linux source tree I noticed that
Kontron did upstream the carrier board .dts files but in a different
manner:

 * arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts
 * arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts

This means that barebox would need to adapt the includes. Can you please
mention that the .dtsi are not used by linux mainline and instead a
different approach was used?

Regards,
  Marco


> 
> Regards,
>   Marco
> 
> > 
> > >> I will add the som.dts, please don't remove the kontron dtsi files yet.
> 
> 

Re: [PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[Frank Li]

On Thu, Nov 05, 2026 at 04:35:11PM +0100, Marco Felsch wrote:
> On 26-11-05 16:09, Marco Felsch wrote:
> > On 26-11-05 09:06, Rob Herring wrote:
> > > On Thu, Nov 5, 2026 at 9:00 AM Marco Felsch <m.felsch@pengutronix.de> wrote:
> > > >
> > > > On 26-11-05 08:49, Rob Herring (Arm) wrote:
> > > > > These .dtsi files are not included anywhere in the tree and can't be
> > > > > tested.
> > > > >
> > > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > > > > ---
> > > > > v2:
> > > > >  - Rebased
> > > > >
> > > > > It's been nearly a year and these are still orphans. There was a promise
> > > > > to upstream something for the kontron ones, but that hasn't happened.
> > > >
> > > > That's unfortunate, but these includes are used at least by the barebox
> > > > bootloader [1,2], dropping these would cause a DT regresssion.
> > > >
> > > > Would it help to upstream [1,2]?
> > >
> > > You said you were going to do that on v1:
> >
> > Unfortunate no Kontron dev was chiming in. Will do it now!
>
> Okay, after checking the current linux source tree I noticed that
> Kontron did upstream the carrier board .dts files but in a different
> manner:
>
>  * arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts
>  * arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts
>
> This means that barebox would need to adapt the includes. Can you please
> mention that the .dtsi are not used by linux mainline and instead a
> different approach was used?

So, Is it okay to pick this patch?

Frank

>
> Regards,
>   Marco
>
>
> >
> > Regards,
> >   Marco
> >
> > >
> > > >> I will add the som.dts, please don't remove the kontron dtsi files yet.
> >
> >
>

Re: [PATCH v2] ARM: dts: nxp/imx6: Drop unused .dtsi

[Marco Felsch]

On 26-11-05 10:41, Frank Li wrote:
> On Thu, Nov 05, 2026 at 04:35:11PM +0100, Marco Felsch wrote:
> > On 26-11-05 16:09, Marco Felsch wrote:
> > > On 26-11-05 09:06, Rob Herring wrote:
> > > > On Thu, Nov 5, 2026 at 9:00 AM Marco Felsch <m.felsch@pengutronix.de> wrote:
> > > > >
> > > > > On 26-11-05 08:49, Rob Herring (Arm) wrote:
> > > > > > These .dtsi files are not included anywhere in the tree and can't be
> > > > > > tested.
> > > > > >
> > > > > > Signed-off-by: Rob Herring (Arm) <robh@kernel.org>
> > > > > > ---
> > > > > > v2:
> > > > > >  - Rebased
> > > > > >
> > > > > > It's been nearly a year and these are still orphans. There was a promise
> > > > > > to upstream something for the kontron ones, but that hasn't happened.
> > > > >
> > > > > That's unfortunate, but these includes are used at least by the barebox
> > > > > bootloader [1,2], dropping these would cause a DT regresssion.
> > > > >
> > > > > Would it help to upstream [1,2]?
> > > >
> > > > You said you were going to do that on v1:
> > >
> > > Unfortunate no Kontron dev was chiming in. Will do it now!
> >
> > Okay, after checking the current linux source tree I noticed that
> > Kontron did upstream the carrier board .dts files but in a different
> > manner:
> >
> >  * arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts
> >  * arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts
> >
> > This means that barebox would need to adapt the includes. Can you please
> > mention that the .dtsi are not used by linux mainline and instead a
> > different approach was used?
> 
> So, Is it okay to pick this patch?

Yes, if the commit message points out that the final linux devicetrees
did land in a different way. This helps the other projects to adapt
their devicetree ports.

Regards,
  Marco

> 
> Frank
> 
> >
> > Regards,
> >   Marco
> >
> >
> > >
> > > Regards,
> > >   Marco
> > >
> > > >
> > > > >> I will add the som.dts, please don't remove the kontron dtsi files yet.
> > >
> > >
> >