[PATCH 0/2] arm64: dts: (imx8mm|imx8mp)-verdin-dev: Do not include dahlia dtsi

[PATCH 0/2] arm64: dts: (imx8mm|imx8mp)-verdin-dev: Do not include dahlia dtsi

[Philippe Schenker]

From: Philippe Schenker <philippe.schenker@toradex.com>


We so far included the Dahlia device-tree in the development board
devicetree in order to try to minimize code duplication.

This mainly gets rid of ''status = "okay"' lines. Plus we saw that some
settings in the audio-codec of verdin-imx8mm are inherited that are
wrong for the development board. Those did also lead to the DT Schema
checker to fail on multiple settings.

We decided to remove this include in order to get the audio-codec
settings correct and make the DT Schema checker return less warnings.
This introduces some code duplication which we consider being mostly
only configuration of the actual development/dahlia boards.

This series of two patches removes the include for both Verdin boards we
have at the moment.

This issue was spotted by Rob Herring. [1]

[1] https://lore.kernel.org/all/167182349408.373865.10339766752503211557.robh@kernel.org/


Philippe Schenker (2):
  arm64: dts: imx8mm-verdin-dev: Do not include dahlia dtsi
  arm64: dts: imx8mp-verdin-dev: Do not include dahlia dtsi

 .../boot/dts/freescale/imx8mm-verdin-dev.dtsi |  96 ++++++++++++++-
 .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 116 +++++++++++++++++-
 2 files changed, 208 insertions(+), 4 deletions(-)

-- 
2.39.0

[PATCH 1/2] arm64: dts: imx8mm-verdin-dev: Do not include dahlia dtsi

[Philippe Schenker]

From: Philippe Schenker <philippe.schenker@toradex.com>

Inheriting the dahlia devicetree leads to inheriting certain settings
for the audio-codec that are not correct and hence the dt schema check
failing.

Remove that include and put all nodes back that had been included.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
---

 .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 96 ++++++++++++++++++-
 1 file changed, 94 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi b/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi
index b2bcd2282170..3c4b8ca125e3 100644
--- a/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mm-verdin-dev.dtsi
@@ -3,8 +3,6 @@
  * Copyright 2022 Toradex
  */
 
-#include "imx8mm-verdin-dahlia.dtsi"
-
 / {
 	sound_card: sound-card {
 		compatible = "simple-audio-card";
@@ -42,27 +40,121 @@ simple-audio-card,cpu {
 	};
 };
 
+/* Verdin SPI_1 */
+&ecspi2 {
+	status = "okay";
+};
+
+/* EEPROM on display adapter boards */
+&eeprom_display_adapter {
+	status = "okay";
+};
+
+/* EEPROM on Verdin Development board */
+&eeprom_carrier_board {
+	status = "okay";
+};
+
+&fec1 {
+	status = "okay";
+};
+
+/* Verdin QSPI_1 */
+&flexspi {
+	status = "okay";
+};
+
+/* Current measurement into module VCC */
+&hwmon {
+	status = "okay";
+};
+
+&hwmon_temp {
+	vs-supply = <&reg_1p8v>;
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
+
 &gpio_expander_21 {
 	status = "okay";
 };
 
 /* Verdin I2C_1 */
 &i2c4 {
+	status = "okay";
+
 	/* Audio Codec */
 	nau8822_1a: audio-codec@1a {
 		compatible = "nuvoton,nau8822";
 		reg = <0x1a>;
+		#sound-dai-cells = <0>;
 	};
 };
 
+/* Verdin PCIE_1 */
+&pcie0 {
+	status = "okay";
+};
+
+&pcie_phy {
+	status = "okay";
+};
+
+/* Verdin PWM_3_DSI */
+&pwm1 {
+	status = "okay";
+};
+
+/* Verdin PWM_1 */
+&pwm2 {
+	status = "okay";
+};
+
+/* Verdin PWM_2 */
+&pwm3 {
+	status = "okay";
+};
+
+/* Verdin I2S_1 */
+&sai2 {
+	status = "okay";
+};
+
+/* Verdin UART_3 */
+&uart1 {
+	status = "okay";
+};
+
 /* Verdin UART_1, connector X50 through RS485 transceiver */
 &uart2 {
 	linux,rs485-enabled-at-boot-time;
 	rs485-rts-active-low;
 	rs485-rx-during-tx;
+	status = "okay";
+};
+
+/* Verdin UART_2 */
+&uart3 {
+	status = "okay";
+};
+
+/* Verdin USB_1 */
+&usbotg1 {
+	disable-over-current;
+	status = "okay";
+};
+
+/* Verdin USB_2 */
+&usbotg2 {
+	disable-over-current;
+	status = "okay";
 };
 
 /* Limit frequency on dev board due to long traces and bad signal integrity */
 &usdhc2 {
 	max-frequency = <100000000>;
+	status = "okay";
 };
-- 
2.39.0

[PATCH 2/2] arm64: dts: imx8mp-verdin-dev: Do not include dahlia dtsi

[Philippe Schenker]

From: Philippe Schenker <philippe.schenker@toradex.com>

Follow the change that has been done on imx8mm-verdin-dev.dtsi and
remove the include from dahlia to be consistent. Put back all nodes that
previously had been included.

Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>

---

 .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 116 +++++++++++++++++-
 1 file changed, 114 insertions(+), 2 deletions(-)

diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
index cefabe65b252..361426c0da0a 100644
--- a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
+++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
@@ -3,8 +3,6 @@
  * Copyright 2022 Toradex
  */
 
-#include "imx8mp-verdin-dahlia.dtsi"
-
 / {
 	/* TODO: Audio Codec */
 
@@ -21,16 +19,99 @@ reg_eth2phy: regulator-eth2phy {
 	};
 };
 
+&backlight {
+	power-supply = <&reg_3p3v>;
+};
+
+/* Verdin SPI_1 */
+&ecspi1 {
+	status = "okay";
+};
+
+/* EEPROM on display adapter boards */
+&eeprom_display_adapter {
+	status = "okay";
+};
+
+/* EEPROM on Verdin Development board */
+&eeprom_carrier_board {
+	status = "okay";
+};
+
+&eqos {
+	status = "okay";
+};
+
 &fec {
 	phy-supply = <&reg_eth2phy>;
 	status = "okay";
 };
 
+&flexcan1 {
+	status = "okay";
+};
+
+&flexcan2 {
+	status = "okay";
+};
+
+/* Verdin QSPI_1 */
+&flexspi {
+	status = "okay";
+};
+
 &gpio_expander_21 {
 	status = "okay";
 	vcc-supply = <&reg_1p8v>;
 };
 
+/* Current measurement into module VCC */
+&hwmon {
+	status = "okay";
+};
+
+&hwmon_temp {
+	vs-supply = <&reg_1p8v>;
+	status = "okay";
+};
+
+/* Verdin I2C_2_DSI */
+&i2c2 {
+	status = "okay";
+};
+
+&i2c3 {
+	status = "okay";
+};
+
+/* Verdin I2C_1 */
+&i2c4 {
+	status = "okay";
+
+	/* TODO: Audio Codec */
+};
+
+/* TODO: Verdin PCIE_1 */
+
+/* Verdin PWM_1 */
+&pwm1 {
+	status = "okay";
+};
+
+/* Verdin PWM_2 */
+&pwm2 {
+	status = "okay";
+};
+
+/* Verdin PWM_3_DSI */
+&pwm3 {
+	status = "okay";
+};
+
+&reg_usdhc2_vmmc {
+	vin-supply = <&reg_3p3v>;
+};
+
 /* TODO: Verdin I2C_1 with Audio Codec */
 
 /* Verdin UART_1, connector X50 through RS485 transceiver */
@@ -38,9 +119,40 @@ &uart1 {
 	linux,rs485-enabled-at-boot-time;
 	rs485-rts-active-low;
 	rs485-rx-during-tx;
+	status = "okay";
+};
+
+/* Verdin UART_2 */
+&uart2 {
+	status = "okay";
+};
+
+/* Verdin UART_3, used as the Linux Console */
+&uart3 {
+	status = "okay";
+};
+
+/* Verdin USB_1 */
+&usb3_0 {
+	status = "okay";
+};
+
+&usb3_phy0 {
+	status = "okay";
+};
+
+/* Verdin USB_2 */
+&usb3_1 {
+	fsl,permanently-attached;
+	status = "okay";
+};
+
+&usb3_phy1 {
+	status = "okay";
 };
 
 /* Limit frequency on dev board due to long traces and bad signal integrity */
 &usdhc2 {
 	max-frequency = <100000000>;
+	status = "okay";
 };
-- 
2.39.0

Re: [PATCH 2/2] arm64: dts: imx8mp-verdin-dev: Do not include dahlia dtsi

[Laurent Pinchart]

Hi Philippe,

Thank you for the patch.

On Wed, Jan 18, 2023 at 11:52:51AM +0100, Philippe Schenker wrote:
> From: Philippe Schenker <philippe.schenker@toradex.com>
> 
> Follow the change that has been done on imx8mm-verdin-dev.dtsi and
> remove the include from dahlia to be consistent. Put back all nodes that
> previously had been included.
> 
> Signed-off-by: Philippe Schenker <philippe.schenker@toradex.com>
> 
> ---
> 
>  .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 116 +++++++++++++++++-
>  1 file changed, 114 insertions(+), 2 deletions(-)
> 
> diff --git a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
> index cefabe65b252..361426c0da0a 100644
> --- a/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
> +++ b/arch/arm64/boot/dts/freescale/imx8mp-verdin-dev.dtsi
> @@ -3,8 +3,6 @@
>   * Copyright 2022 Toradex
>   */
>  
> -#include "imx8mp-verdin-dahlia.dtsi"
> -

Makes sense.

Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>

>  / {
>  	/* TODO: Audio Codec */
>  
> @@ -21,16 +19,99 @@ reg_eth2phy: regulator-eth2phy {
>  	};
>  };
>  
> +&backlight {
> +	power-supply = <&reg_3p3v>;
> +};
> +
> +/* Verdin SPI_1 */
> +&ecspi1 {
> +	status = "okay";
> +};
> +
> +/* EEPROM on display adapter boards */
> +&eeprom_display_adapter {
> +	status = "okay";
> +};
> +
> +/* EEPROM on Verdin Development board */
> +&eeprom_carrier_board {
> +	status = "okay";
> +};
> +
> +&eqos {
> +	status = "okay";
> +};
> +
>  &fec {
>  	phy-supply = <&reg_eth2phy>;
>  	status = "okay";
>  };
>  
> +&flexcan1 {
> +	status = "okay";
> +};
> +
> +&flexcan2 {
> +	status = "okay";
> +};
> +
> +/* Verdin QSPI_1 */
> +&flexspi {
> +	status = "okay";
> +};
> +
>  &gpio_expander_21 {
>  	status = "okay";
>  	vcc-supply = <&reg_1p8v>;
>  };
>  
> +/* Current measurement into module VCC */
> +&hwmon {
> +	status = "okay";
> +};
> +
> +&hwmon_temp {
> +	vs-supply = <&reg_1p8v>;
> +	status = "okay";
> +};
> +
> +/* Verdin I2C_2_DSI */
> +&i2c2 {
> +	status = "okay";
> +};
> +
> +&i2c3 {
> +	status = "okay";
> +};
> +
> +/* Verdin I2C_1 */
> +&i2c4 {
> +	status = "okay";
> +
> +	/* TODO: Audio Codec */
> +};
> +
> +/* TODO: Verdin PCIE_1 */
> +
> +/* Verdin PWM_1 */
> +&pwm1 {
> +	status = "okay";
> +};
> +
> +/* Verdin PWM_2 */
> +&pwm2 {
> +	status = "okay";
> +};
> +
> +/* Verdin PWM_3_DSI */
> +&pwm3 {
> +	status = "okay";
> +};
> +
> +&reg_usdhc2_vmmc {
> +	vin-supply = <&reg_3p3v>;
> +};
> +
>  /* TODO: Verdin I2C_1 with Audio Codec */
>  
>  /* Verdin UART_1, connector X50 through RS485 transceiver */
> @@ -38,9 +119,40 @@ &uart1 {
>  	linux,rs485-enabled-at-boot-time;
>  	rs485-rts-active-low;
>  	rs485-rx-during-tx;
> +	status = "okay";
> +};
> +
> +/* Verdin UART_2 */
> +&uart2 {
> +	status = "okay";
> +};
> +
> +/* Verdin UART_3, used as the Linux Console */
> +&uart3 {
> +	status = "okay";
> +};
> +
> +/* Verdin USB_1 */
> +&usb3_0 {
> +	status = "okay";
> +};
> +
> +&usb3_phy0 {
> +	status = "okay";
> +};
> +
> +/* Verdin USB_2 */
> +&usb3_1 {
> +	fsl,permanently-attached;
> +	status = "okay";
> +};
> +
> +&usb3_phy1 {
> +	status = "okay";
>  };
>  
>  /* Limit frequency on dev board due to long traces and bad signal integrity */
>  &usdhc2 {
>  	max-frequency = <100000000>;
> +	status = "okay";
>  };

-- 
Regards,

Laurent Pinchart

Re: [PATCH 0/2] arm64: dts: (imx8mm|imx8mp)-verdin-dev: Do not include dahlia dtsi

[Shawn Guo]

On Wed, Jan 18, 2023 at 11:52:49AM +0100, Philippe Schenker wrote:
> From: Philippe Schenker <philippe.schenker@toradex.com>
> 
> 
> We so far included the Dahlia device-tree in the development board
> devicetree in order to try to minimize code duplication.
> 
> This mainly gets rid of ''status = "okay"' lines. Plus we saw that some
> settings in the audio-codec of verdin-imx8mm are inherited that are
> wrong for the development board. Those did also lead to the DT Schema
> checker to fail on multiple settings.
> 
> We decided to remove this include in order to get the audio-codec
> settings correct and make the DT Schema checker return less warnings.
> This introduces some code duplication which we consider being mostly
> only configuration of the actual development/dahlia boards.
> 
> This series of two patches removes the include for both Verdin boards we
> have at the moment.
> 
> This issue was spotted by Rob Herring. [1]
> 
> [1] https://lore.kernel.org/all/167182349408.373865.10339766752503211557.robh@kernel.org/
> 
> 
> Philippe Schenker (2):
>   arm64: dts: imx8mm-verdin-dev: Do not include dahlia dtsi
>   arm64: dts: imx8mp-verdin-dev: Do not include dahlia dtsi

Applied both, thanks!