ARM: dts: nxp/imx6: Drop unused .dtsi

Thank you for your contribution! Sashiko AI review found 1 potential issue(s) to consider:
- [Medium] ARM: dts: imx6: Deleting Dwarf and Nymph .dtsi omitted by copy-paste in .dts --

commit 22f4920daa7995325841819b6b25c37d2efd2b30
Author: Rob Herring (Arm) <[email protected]>

ARM: dts: nxp/imx6: Drop unused .dtsi

This commit removes four i.MX6 device tree include files that are not currently included by any in-tree device tree sources.

Quoted 11 lines

arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi deleted +0 -5

deleted file mode 100644
index 3a968782e854b..0000000000000
@@ -1,45 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-//
-// Copyright 2017 NXP
-
-#include "imx6qdl-pico.dtsi"

[ ... ]

arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi line 3

Quoted 9 lines

arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi deleted +0 -3

deleted file mode 100644
index 3d56a42164482..0000000000000
@@ -1,54 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
-
-#include "imx6qdl-pico.dtsi"

[Severity: Medium]
Should imx6qdl-pico-dwarf.dtsi and imx6qdl-pico-nymph.dtsi be wired up to their existing board device trees instead of being deleted?

Unlike the Kontron files, the corresponding board files for Dwarf and Nymph already exist in the tree and are built by arch/arm/boot/dts/nxp/imx/Makefile (imx6dl-pico-dwarf.dts, imx6q-pico-dwarf.dts, imx6dl-pico-nymph.dts, and imx6q-pico-nymph.dts).

When commit 98670a0bb0ef ("ARM: dts: imx6qdl: Add imx6qdl-pico support") added support for the Dwarf, Hobbit, Nymph, and Pi baseboards, a copy-paste error left the Dwarf and Nymph .dts files including imx6qdl-pico-pi.dtsi:

arch/arm/boot/dts/nxp/imx/imx6dl-pico-dwarf.dts:

    #include "imx6dl.dtsi"
    #include "imx6qdl-pico-pi.dtsi"

    / {
            model = "TechNexion PICO-IMX6 DualLite/Solo Board and Dwarf baseboard";
            compatible = "technexion,imx6dl-pico-dwarf", "fsl,imx6dl";
    };

arch/arm/boot/dts/nxp/imx/imx6dl-pico-nymph.dts:

    #include "imx6dl.dtsi"
    #include "imx6qdl-pico-pi.dtsi"

    / {
            model = "TechNexion PICO-IMX6 DualLite/Solo Board and Nymph baseboard";
            compatible = "technexion,imx6dl-pico-nymph", "fsl,imx6dl";
    };

(and similarly in imx6q-pico-dwarf.dts and imx6q-pico-nymph.dts).

As a result, the Dwarf and Nymph board DTBs are currently built with the Pi baseboard description (which disables HDMI and routes the LED to GPIO5_IO18) rather than their own baseboard descriptions in imx6qdl-pico-dwarf.dtsi (GPIO5_IO31 LED, mpl3115@60 on i2c1, and pca9554 io-expander@25 on i2c2) and imx6qdl-pico-nymph.dtsi (GPIO5_IO31 LED, adc@52 on i2c1, pca9554 io-expander@25 on i2c2, ds1337 rtc@68 on i2c3, and PCIe enabled).

Would it make sense to keep imx6qdl-pico-dwarf.dtsi and imx6qdl-pico-nymph.dtsi and update the four Dwarf and Nymph .dts files to include them?

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

Signed-off-by Rob Herring (Arm) <[email protected]>

---
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

arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi deleted +0 -12

deleted file mode 100644
index 5a9b819d7ee8..000000000000
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
-/*
- * Copyright 2019 (C) Pengutronix, Marco Felsch <[email protected]>
- */
-
-#include "imx6dl.dtsi"
-#include "imx6qdl-kontron-samx6i.dtsi"
-
-/ {
-	model = "Kontron SMARC-sAMX6i Dual-Lite/Solo";
-	compatible = "kontron,imx6dl-samx6i", "fsl,imx6dl";
-};

arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi deleted +0 -12

deleted file mode 100644
index e76963436079..000000000000
@@ -1,12 +0,0 @@
-// SPDX-License-Identifier: GPL-2.0 OR X11
-/*
- * Copyright 2019 (C) Pengutronix, Marco Felsch <[email protected]>
- */
-
-#include "imx6q.dtsi"
-#include "imx6qdl-kontron-samx6i.dtsi"
-
-/ {
-	model = "Kontron SMARC-sAMX6i Quad/Dual";
-	compatible = "kontron,imx6q-samx6i", "fsl,imx6q";
-};

arch/arm/boot/dts/nxp/imx/imx6qdl-pico-dwarf.dtsi deleted +0 -45

deleted file mode 100644
index 3a968782e854..000000000000
@@ -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
-		>;
-	};
-};

arch/arm/boot/dts/nxp/imx/imx6qdl-pico-nymph.dtsi deleted +0 -54

deleted file mode 100644
index 3d56a4216448..000000000000
@@ -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
-		>;
-	};
-};

Signature · 1 line

2.53.0

Quoted 8 lines · Rob Herring (Arm)

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

Signed-off-by Rob Herring (Arm) <[email protected]>

---
v2:
- Rebased

Quoted 2 lines

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]?

Quoted 1 line

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

Quoted 13 lines · Marco Felsch

Quoted 10 lines · Rob Herring (Arm)

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

Signed-off-by Rob Herring (Arm) <[email protected]>

---
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.

Quoted 4 lines

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:

Quoted 2 lines

Quoted 2 lines

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

Quoted 14 lines · Rob Herring

Quoted 13 lines · Marco Felsch

Quoted 10 lines · Rob Herring (Arm)

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

Signed-off-by Rob Herring (Arm) <[email protected]>

---
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.

Quoted 6 lines

Quoted 4 lines

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

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

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

Quoted 15 lines · Marco Felsch

Quoted 14 lines · Rob Herring

Quoted 13 lines · Marco Felsch

Quoted 10 lines · Rob Herring (Arm)

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

Signed-off-by Rob Herring (Arm) <[email protected]>

---
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.

Quoted 8 lines

Quoted 6 lines

Quoted 4 lines

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

Quoted 8 lines

Regards,
Marco

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

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

Quoted 29 lines · Marco Felsch

Quoted 15 lines · Marco Felsch

Quoted 14 lines · Rob Herring

Quoted 13 lines · Marco Felsch

Quoted 10 lines · Rob Herring (Arm)

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

Signed-off-by Rob Herring (Arm) <[email protected]>

---
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.

Quoted 8 lines

Quoted 6 lines

Quoted 4 lines

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:

Quoted 6 lines

* 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

Quoted 14 lines

Regards,
Marco

Quoted 8 lines

Regards,
Marco

Quoted 2 lines

Quoted 2 lines

Quoted 2 lines

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