Skip to contentSkip to conversation

ARM: dts: imx7-colibri: device tree improvements

PATCH Applied Marcel Ziswiler 4 participants 29 messages May 16, 2022 – Jun 19, 2022

Subsystems (3)
lore
Share & tools
lore
#0 lore raw

v2 cover ARM: dts: imx7-colibri: device tree improvements

From: Marcel Ziswiler <[email protected]>

This is a general update of the Colibri iMX7 device tree files.

The Toradex Colibri family is composed of a SoM that can be plugged on various carrier boards, with carrier boards allowing multiple optional accessories (e.g. display, camera, ...).

The device tree sources are structured into a SoM dtsi and a carrier dts which then includes the SoM dtsi. The SoM dtsi defines and enables the functionality self-contained on the SoM and prepares for the functionality provided by the carrier HW or accessories so that the carrier dts then can enable or amend nodes provided. Accessories are enabled in overlays depending on HW configuration.

Please find the following colibri-imx7 device trees improvements:

- Display/Touch Functionality Overhaul
Rename display interface to match other modules to make it easier to use device tree overlays.
The parallel RGB interface (lcdif) and all related stuff turn on in a device tree overlay. Keep them disabled in the main devicetree. As these subsystems are provided by module and not a part of boards, move their definitions into the module-level devicetree. Disable ad7879 touchscreen which turns on in a devic tree overlay. Remains it disabled in the main devicetree.
The Toradex 7" Capacitive and 10" LVDS touch screens are Atmel MXT peripherals available on the I2C bus for touchscreen events. Add atmel_mxt_ts node to the module-level device tree. Also, provide pinmux configuration for the INT/RST inputs from SODIMM pins 106/107 for most carrier boards or an external touchscreen adapter inputs configured to SODIMM pins 28/30.

- Ethernet Improvements
Add the MDIO bus with the respective PHY.
Add Ethernet aliases which is required to properly pass MAC address from bootloader.
Add delay for on-module phy supply.

- USB Device/Host Switching
Add usb dual-role switching using extcon.

- MMC/SD
The original Colibri specification only defined 3.3 volt TTL signaling and relied on external on-carrier pull-ups for the SD_DATA[0..3] lines. The latest carrier boards like Iris V2 on the other hand are now UHS-I compliant by leaving such external on-carrier pull-ups away relying on module- or even SoC-level ones which pull up to resp. signaling voltage. In such cases, the carrier board-level device tree may explicitly delete the no-1-8-v property to enable full UHS-I support.
Also, fix SD/MMC regulator for the carrier boards using UHS-I modes.

- Add Iris and Iris V2 Carrier Board Device Trees
Add support for Toradex Iris carrier boards.

Changes in v2:
- Add Krzysztof's acked-by. Thanks!
- Revert change on arch/arm/boot/dts/imx6dl-colibri-iris.dts which slipped into this patch set by error.
- Re-based on top of Shawn's for-next.

Marcel Ziswiler (18):
ARM: dts: imx7-colibri: overhaul display/touch functionality
ARM: dts: imx7-colibri: add mdio phy node
ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys
ARM: dts: imx7-colibri: move regulators
ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep config
ARM: dts: imx7-colibri: move rtc node
ARM: dts: imx7d-colibri-emmc: add cpu1 supply
ARM: dts: imx7-colibri-eval-v3: correct can controller comment
ARM: dts: imx7-colibri: disable adc2
ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pins
ARM: dts: imx7-colibri: add clarifying comments
ARM: dts: imx7-colibri: alphabetical re-order
ARM: dts: imx7-colibri: clean-up device enabling/disabling
ARM: dts: imx7-colibri: remove leading zero from reg address
ARM: dts: imx7-colibri: set regulator-name properties
ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group naming
dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2
ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards

Max Krummenacher (1):
ARM: dts: imx7-colibri: add ethernet aliases

Oleksandr Suvorov (3):
ARM: dts: imx7-colibri: improve licensing and compatible strings
ARM: dts: imx7-colibri: improve wake-up with gpio key
ARM: dts: imx7-colibri: add delay for on-module phy supply

Philippe Schenker (1):
ARM: dts: imx7-colibri: add usb dual-role switching using extcon

Stefan Agner (1):
ARM: dts: imx7-colibri: set lcdif clock source to video pll

 .../devicetree/bindings/arm/fsl.yaml          |   6 +
 arch/arm/boot/dts/Makefile                    |   6 +
 arch/arm/boot/dts/imx7-colibri-aster.dtsi     | 142 +--
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi   | 156 +---
 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi   | 112 +++
 arch/arm/boot/dts/imx7-colibri-iris.dtsi      | 108 +++
 arch/arm/boot/dts/imx7-colibri.dtsi           | 830 +++++++++++-------
 arch/arm/boot/dts/imx7d-colibri-aster.dts     |  30 +-
 .../arm/boot/dts/imx7d-colibri-emmc-aster.dts |  10 +-
 .../boot/dts/imx7d-colibri-emmc-eval-v3.dts   |  10 +-
 .../boot/dts/imx7d-colibri-emmc-iris-v2.dts   |  21 +
 arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts |  21 +
 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi     |  17 +-
 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts   |  45 +-
 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts   |  83 ++
 arch/arm/boot/dts/imx7d-colibri-iris.dts      |  56 ++
 arch/arm/boot/dts/imx7d-colibri.dtsi          |  13 +-
 arch/arm/boot/dts/imx7s-colibri-aster.dts     |  27 +-
 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts   |  43 +-
 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts   |  78 ++
 arch/arm/boot/dts/imx7s-colibri-iris.dts      |  51 ++
 arch/arm/boot/dts/imx7s-colibri.dtsi          |   5 +-
 22 files changed, 1291 insertions(+), 579 deletions(-)
 create mode 100644 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
 create mode 100644 arch/arm/boot/dts/imx7-colibri-iris.dtsi
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris.dts
 create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts
 create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris.dts
Signature · 1 line
2.35.1
#1 lore raw

PATCH v2 1/24 ARM: dts: imx7-colibri: overhaul display/touch functionality

From: Marcel Ziswiler <[email protected]>

Rename display interface to match other modules to make it easier to use device tree overlays.

The parallel RGB interface (lcdif) and all related stuff turn on in a device tree overlay. Keep them disabled in the main devicetree. As these subsystems are provided by module and not a part of boards, move their definitions into the module-level devicetree.

Disable ad7879 touchscreen which turns on in a devic tree overlay. Remains it disabled in the main devicetree.

Move Atmel MXT capacitive touch controller device tree nodes from carrier board to module level and add iomux pinctl groups for both the Capacitive Touch Adapter (using SODIMM 28/30) and the capacitive touch connector as found on later carrier boards (using SODIMM 106/107).

Keep touchscreen and display nodes enabled for NAND based i.MX 7 modules, since device tree overlays are not yet supported. For the Colibri Evaluation Board keep the Capacitive Touch Adapter node disabled and PWM2, PWM3 enabled instead.

For eMMC based modules keep nodes disabled to work in conjunction with device tree overlays.

Add the iomuxc pinctrl group for the LVDS transceiver related signals to use it in a device tree overlay.

While at it also alphabetically re=order them properties.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi   | 53 ------------
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 66 +++-----------
 arch/arm/boot/dts/imx7-colibri.dtsi         | 95 ++++++++++++++++++---
 arch/arm/boot/dts/imx7d-colibri-aster.dts   | 20 +++++
 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 32 +++++++
 arch/arm/boot/dts/imx7s-colibri-aster.dts   | 20 +++++
 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts | 32 +++++++
 7 files changed, 197 insertions(+), 121 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +0 -53
index b770fc937970..950b4e5f6cf4 100644
@@ -4,10 +4,6 @@
  *
  */
 
-
-#include <dt-bindings/input/input.h>
-#include <dt-bindings/pwm/pwm.h>
-
 / {
 	chosen {
 		stdout-path = "serial0:115200n8";
@@ -27,18 +23,6 @@ power {
 		};
 	};
 
-	panel: panel {
-		compatible = "edt,et057090dhu";
-		backlight = <&bl>;
-		power-supply = <&reg_3v3>;
-
-		port {
-			panel_in: endpoint {
-				remote-endpoint = <&lcdif_out>;
-			};
-		};
-	};
-
 	reg_3v3: regulator-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "3.3V";
@@ -77,13 +61,6 @@ &adc2 {
 	status = "disabled";
 };
 
-&bl {
-	brightness-levels = <0 4 8 16 32 64 128 255>;
-	default-brightness-level = <6>;
-	power-supply = <&reg_3v3>;
-	status = "okay";
-};
-
 &fec1 {
 	status = "okay";
 };
@@ -91,17 +68,6 @@ &fec1 {
 &i2c4 {
 	status = "okay";
 
-	/* Microchip/Atmel maxtouch controller */
-	touchscreen@4a {
-		compatible = "atmel,maxtouch";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpiotouch>;
-		reg = <0x4a>;
-		interrupt-parent = <&gpio2>;
-		interrupts = <15 IRQ_TYPE_EDGE_FALLING>;	/* SODIMM 107 */
-		reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;	/* SODIMM 106 */
-	};
-
 	/* M41T0M6 real time clock on carrier board */
 	rtc: rtc@68 {
 		compatible = "st,m41t0";
@@ -109,25 +75,6 @@ rtc: rtc@68 {
 	};
 };
 
-&iomuxc {
-	pinctrl_gpiotouch: touchgpios {
-		fsl,pins = <
-			MX7D_PAD_EPDC_DATA15__GPIO2_IO15        0x74
-			MX7D_PAD_EPDC_BDR0__GPIO2_IO28          0x14
-		>;
-	};
-};
-
-&lcdif {
-	status = "okay";
-
-	port {
-		lcdif_out: endpoint {
-			remote-endpoint = <&panel_in>;
-		};
-	};
-};
-
 &pwm1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +12 -54

99 lines not on this page · raw message

arch/arm/boot/dts/imx7-colibri.dtsi +81 -14

145 lines not on this page · raw message

arch/arm/boot/dts/imx7d-colibri-aster.dts +20 -0
index f3f0537d5a37..ce0e6bb7db37 100644
@@ -14,6 +14,26 @@ / {
 		     "fsl,imx7d";
 };
 
+&ad7879_ts {
+	status = "okay";
+};
+
+&atmel_mxt_ts {
+	status = "okay";
+};
+
+&backlight {
+	status = "okay";
+};
+
+&lcdif {
+	status = "okay";
+};
+
+&panel_dpi {
+	status = "okay";
+};
+
 &usbotg2 {
 	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +32 -0
index 87b132bcd272..c610c50c003a 100644
@@ -13,6 +13,38 @@ / {
 		     "fsl,imx7d";
 };
 
+&ad7879_ts {
+	status = "okay";
+};
+
+/*
+ * The Atmel maxtouch controller uses SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, pwm3.
+ * So if you enable following capacitive touch controller, disable pwm2/pwm3 first.
+ */
+&atmel_mxt_ts {
+	status = "disabled";
+};
+
+&backlight {
+	status = "okay";
+};
+
+&lcdif {
+	status = "okay";
+};
+
+&panel_dpi {
+	status = "okay";
+};
+
+&pwm2 {
+	status = "okay";
+};
+
+&pwm3 {
+	status = "okay";
+};
+
 &usbotg2 {
 	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
arch/arm/boot/dts/imx7s-colibri-aster.dts +20 -0
index fca4e0a95c1b..87f9e0e079a8 100644
@@ -13,3 +13,23 @@ / {
 	compatible = "toradex,colibri-imx7s-aster", "toradex,colibri-imx7s",
 		     "fsl,imx7s";
 };
+
+&ad7879_ts {
+	status = "okay";
+};
+
+&atmel_mxt_ts {
+	status = "okay";
+};
+
+&backlight {
+	status = "okay";
+};
+
+&lcdif {
+	status = "okay";
+};
+
+&panel_dpi {
+	status = "okay";
+};
arch/arm/boot/dts/imx7s-colibri-eval-v3.dts +32 -0
index aa70d3f2e2e2..81956c16b95b 100644
@@ -12,3 +12,35 @@ / {
 	compatible = "toradex,colibri-imx7s-eval-v3", "toradex,colibri-imx7s",
 		     "fsl,imx7s";
 };
+
+&ad7879_ts {
+	status = "okay";
+};
+
+/*
+ * The Atmel maxtouch controller uses SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, pwm3.
+ * So if you enable following capacitive touch controller, disable pwm2/pwm3 first.
+ */
+&atmel_mxt_ts {
+	status = "disabled";
+};
+
+&backlight {
+	status = "okay";
+};
+
+&lcdif {
+	status = "okay";
+};
+
+&panel_dpi {
+	status = "okay";
+};
+
+&pwm2 {
+	status = "okay";
+};
+
+&pwm3 {
+	status = "okay";
+};
Signature · 1 line
2.35.1
#2 lore raw

PATCH v2 2/24 ARM: dts: imx7-colibri: add mdio phy node

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add the MDIO bus with the respective PHY to allow for making changes to that easier.

While at it also alphabetically re-order properties and improve indentation.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri.dtsi | 35 ++++++++++++++++++++---------
 1 file changed, 24 insertions(+), 11 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +24 -11
index e20b0977f38f..074ebb0f8001 100644
@@ -83,21 +83,34 @@ &ecspi3 {
 };
 
 &fec1 {
-	pinctrl-names = "default", "sleep";
-	pinctrl-0 = <&pinctrl_enet1>;
-	pinctrl-1 = <&pinctrl_enet1_sleep>;
-	clocks = <&clks IMX7D_ENET_AXI_ROOT_CLK>,
-		<&clks IMX7D_ENET_AXI_ROOT_CLK>,
-		<&clks IMX7D_ENET1_TIME_ROOT_CLK>,
-		<&clks IMX7D_PLL_ENET_MAIN_50M_CLK>;
-	clock-names = "ipg", "ahb", "ptp", "enet_clk_ref";
-	assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>,
-			  <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
 	assigned-clock-parents = <&clks IMX7D_PLL_ENET_MAIN_100M_CLK>;
 	assigned-clock-rates = <0>, <100000000>;
+	assigned-clocks = <&clks IMX7D_ENET1_TIME_ROOT_SRC>,
+			  <&clks IMX7D_ENET1_TIME_ROOT_CLK>;
+	clock-names = "ipg", "ahb", "ptp", "enet_clk_ref";
+	clocks = <&clks IMX7D_ENET_AXI_ROOT_CLK>,
+		 <&clks IMX7D_ENET_AXI_ROOT_CLK>,
+		 <&clks IMX7D_ENET1_TIME_ROOT_CLK>,
+		 <&clks IMX7D_PLL_ENET_MAIN_50M_CLK>;
+	fsl,magic-packet;
+	phy-handle = <&ethphy0>;
 	phy-mode = "rmii";
 	phy-supply = <&reg_LDO1>;
-	fsl,magic-packet;
+	pinctrl-names = "default", "sleep";
+	pinctrl-0 = <&pinctrl_enet1>;
+	pinctrl-1 = <&pinctrl_enet1_sleep>;
+
+	mdio {
+		#address-cells = <1>;
+		#size-cells = <0>;
+
+		ethphy0: ethernet-phy@0 {
+			compatible = "ethernet-phy-ieee802.3-c22";
+			max-speed = <100>;
+			micrel,led-mode = <0>;
+			reg = <0>;
+		};
+	};
 };
 
 &flexcan1 {
Signature · 1 line
2.35.1
#3 lore raw

PATCH v2 3/24 ARM: dts: imx7-colibri: set lcdif clock source to video pll

In reply to Marcel Ziswiler

From: Stefan Agner <[email protected]>

Use the video PLL as clock source to assure proper pixel clock generation.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri.dtsi | 2 ++
 1 file changed, 2 insertions(+)
arch/arm/boot/dts/imx7-colibri.dtsi +2 -0
index 074ebb0f8001..3c1cfd766645 100644
@@ -441,6 +441,8 @@ atmel_mxt_ts: touchscreen@4a {
 };
 
 &lcdif {
+	assigned-clocks = <&clks IMX7D_LCDIF_PIXEL_ROOT_SRC>;
+	assigned-clock-parents = <&clks IMX7D_PLL_VIDEO_POST_DIV>;
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_lcdif_dat
 		     &pinctrl_lcdif_ctrl>;
Signature · 1 line
2.35.1
#4 lore raw

PATCH v2 4/24 ARM: dts: imx7-colibri: add usb dual-role switching using extcon

In reply to Marcel Ziswiler

From: Philippe Schenker <[email protected]>

Add USB dual-role switching using extcon.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 8 ++++++++
 arch/arm/boot/dts/imx7-colibri.dtsi         | 5 ++---
 2 files changed, 10 insertions(+), 3 deletions(-)
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +8 -0
index d6fa74222960..17ad9065646d 100644
@@ -20,6 +20,13 @@ clk16m: clk16m {
 		clock-frequency = <16000000>;
 	};
 
+	extcon_usbc_det: usbc-det {
+		compatible = "linux,extcon-usb-gpio";
+		id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_usbc_det>;
+	};
+
 	gpio-keys {
 		compatible = "gpio-keys";
 		pinctrl-names = "default";
@@ -141,6 +148,7 @@ &uart3 {
 };
 
 &usbotg1 {
+	extcon = <0>, <&extcon_usbc_det>;
 	status = "okay";
 };
 
arch/arm/boot/dts/imx7-colibri.dtsi +2 -3
index 3c1cfd766645..6df82a67953a 100644
@@ -512,7 +512,7 @@ &uart3 {
 };
 
 &usbotg1 {
-	dr_mode = "host";
+	dr_mode = "otg";
 };
 
 &usdhc1 {
@@ -540,8 +540,7 @@ &usdhc3 {
 
 &iomuxc {
 	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4
-		     &pinctrl_usbc_det>;
+	pinctrl-0 = <&pinctrl_gpio1 &pinctrl_gpio2 &pinctrl_gpio3 &pinctrl_gpio4>;
 
 	/*
 	 * Atmel MXT touchsceen + Capacitive Touch Adapter
Signature · 1 line
2.35.1
#5 lore raw

PATCH v2 5/24 ARM: dts: imx7-colibri: improve licensing and compatible strings

In reply to Marcel Ziswiler

From: Oleksandr Suvorov <[email protected]>

Migrate to the latest SPDX license identifier, update copyright period and improve compatible strings.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi        | 5 ++---
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi      | 4 ++--
 arch/arm/boot/dts/imx7-colibri.dtsi              | 4 ++--
 arch/arm/boot/dts/imx7d-colibri-aster.dts        | 7 ++++---
 arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts   | 8 +++++---
 arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts | 8 +++++---
 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi        | 4 ++--
 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts      | 7 ++++---
 arch/arm/boot/dts/imx7d-colibri.dtsi             | 4 ++--
 arch/arm/boot/dts/imx7s-colibri-aster.dts        | 7 ++++---
 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts      | 7 ++++---
 arch/arm/boot/dts/imx7s-colibri.dtsi             | 4 ++--
 12 files changed, 38 insertions(+), 31 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +2 -3
index 950b4e5f6cf4..bfadb3a3124a 100644
@@ -1,7 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2017-2020 Toradex AG
- *
+ * Copyright 2017-2022 Toradex
  */
 
 / {
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +2 -2
index 17ad9065646d..074c96f09191 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2016-2020 Toradex
+ * Copyright 2016-2022 Toradex
  */
 
 / {
arch/arm/boot/dts/imx7-colibri.dtsi +2 -2
index 6df82a67953a..fa615379a117 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2016-2020 Toradex
+ * Copyright 2016-2022 Toradex
  */
 
 #include <dt-bindings/pwm/pwm.h>
arch/arm/boot/dts/imx7d-colibri-aster.dts +4 -3
index ce0e6bb7db37..2ed1823c4805 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2017-2020 Toradex AG
+ * Copyright 2017-2022 Toradex
  *
  */
 
@@ -10,7 +10,8 @@
 
 / {
 	model = "Toradex Colibri iMX7D on Aster Carrier Board";
-	compatible = "toradex,colibri-imx7d-aster", "toradex,colibri-imx7d",
+	compatible = "toradex,colibri-imx7d-aster",
+		     "toradex,colibri-imx7d",
 		     "fsl,imx7d";
 };
 
arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts +5 -3
index 20480276cb0e..33e1034b75a4 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2017-2020 Toradex AG
+ * Copyright 2017-2022 Toradex
  *
  */
 
@@ -11,7 +11,9 @@
 / {
 	model = "Toradex Colibri iMX7D 1GB (eMMC) on Aster Carrier Board";
 	compatible = "toradex,colibri-imx7d-emmc-aster",
-		     "toradex,colibri-imx7d-emmc", "fsl,imx7d";
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7d",
+		     "fsl,imx7d";
 };
 
 &usbotg2 {
arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts +5 -3
index 8ee73c870b12..25d8d4583289 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2017 Toradex AG
+ * Copyright 2017-2022 Toradex
  */
 
 /dts-v1/;
@@ -10,7 +10,9 @@
 / {
 	model = "Toradex Colibri iMX7D 1GB (eMMC) on Colibri Evaluation Board V3";
 	compatible = "toradex,colibri-imx7d-emmc-eval-v3",
-		     "toradex,colibri-imx7d-emmc", "fsl,imx7d";
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7d",
+		     "fsl,imx7d";
 };
 
 &usbotg2 {
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +2 -2
index af39e5370fa1..198e08409d59 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2017 Toradex AG
+ * Copyright 2017-2022 Toradex
  */
 
 #include "imx7d.dtsi"
arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +4 -3
index c610c50c003a..51561388fac5 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2016-2020 Toradex
+ * Copyright 2016-2022 Toradex
  */
 
 /dts-v1/;
@@ -9,7 +9,8 @@
 
 / {
 	model = "Toradex Colibri iMX7D on Colibri Evaluation Board V3";
-	compatible = "toradex,colibri-imx7d-eval-v3", "toradex,colibri-imx7d",
+	compatible = "toradex,colibri-imx7d-eval-v3",
+		     "toradex,colibri-imx7d",
 		     "fsl,imx7d";
 };
 
arch/arm/boot/dts/imx7d-colibri.dtsi +2 -2
index 219a0404a058..90d25c604de2 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2016-2020 Toradex
+ * Copyright 2016-2022 Toradex
  */
 
 #include "imx7d.dtsi"
arch/arm/boot/dts/imx7s-colibri-aster.dts +4 -3
index 87f9e0e079a8..58ebb02d948a 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: (GPL-2.0 OR MIT)
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2017-2020 Toradex AG
+ * Copyright 2017-2022 Toradex
  *
  */
 
@@ -10,7 +10,8 @@
 
 / {
 	model = "Toradex Colibri iMX7S on Aster Carrier Board";
-	compatible = "toradex,colibri-imx7s-aster", "toradex,colibri-imx7s",
+	compatible = "toradex,colibri-imx7s-aster",
+		     "toradex,colibri-imx7s",
 		     "fsl,imx7s";
 };
 
arch/arm/boot/dts/imx7s-colibri-eval-v3.dts +4 -3
index 81956c16b95b..6589c4179177 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2016-2020 Toradex
+ * Copyright 2016-2022 Toradex
  */
 
 /dts-v1/;
@@ -9,7 +9,8 @@
 
 / {
 	model = "Toradex Colibri iMX7S on Colibri Evaluation Board V3";
-	compatible = "toradex,colibri-imx7s-eval-v3", "toradex,colibri-imx7s",
+	compatible = "toradex,colibri-imx7s-eval-v3",
+		     "toradex,colibri-imx7s",
 		     "fsl,imx7s";
 };
 
arch/arm/boot/dts/imx7s-colibri.dtsi +2 -2
index 94de220a5965..2ce102b7f5d4 100644
@@ -1,6 +1,6 @@
-// SPDX-License-Identifier: GPL-2.0+ OR MIT
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
- * Copyright 2016-2020 Toradex
+ * Copyright 2016-2022 Toradex
  */
 
 #include "imx7s.dtsi"
Signature · 1 line
2.35.1
#6 lore raw

PATCH v2 6/24 ARM: dts: imx7-colibri: improve wake-up with gpio key

In reply to Marcel Ziswiler

From: Oleksandr Suvorov <[email protected]>

The pin GPIO1_IO01 externally pulls down, it is required to sequentially connect this pin (signal WAKE_MICO#) to +3v3 and then disconnect it to trigger a wakeup interrupt.
Adding the flag GPIO_PULL_DOWN allows the system to be woken up just connecting the pin GPIO1_IO01 to +3v3.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi   | 2 +-
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +1 -1
index bfadb3a3124a..9148c54403f3 100644
@@ -15,7 +15,7 @@ gpio-keys {
 
 		power {
 			label = "Wake-Up";
-			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 			linux,code = <KEY_WAKEUP>;
 			debounce-interval = <10>;
 			wakeup-source;
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +1 -1
index 074c96f09191..4a7e593e9ac6 100644
@@ -34,7 +34,7 @@ gpio-keys {
 
 		power {
 			label = "Wake-Up";
-			gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
+			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
 			linux,code = <KEY_WAKEUP>;
 			debounce-interval = <10>;
 			wakeup-source;
Signature · 1 line
2.35.1
#7 lore raw

PATCH v2 7/24 ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Move aliases, chosen, extcon and gpio-keys to module-level device tree given they are standard Colibri functionalities.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi   | 18 ------------
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 31 --------------------
 arch/arm/boot/dts/imx7-colibri.dtsi         | 32 +++++++++++++++++++++
 3 files changed, 32 insertions(+), 49 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +0 -18
index 9148c54403f3..c12de1861c05 100644
@@ -4,24 +4,6 @@
  */
 
 / {
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
-	gpio-keys {
-		compatible = "gpio-keys";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpiokeys>;
-
-		power {
-			label = "Wake-Up";
-			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
-			linux,code = <KEY_WAKEUP>;
-			debounce-interval = <10>;
-			wakeup-source;
-		};
-	};
-
 	reg_3v3: regulator-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "3.3V";
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +0 -31
index 4a7e593e9ac6..2e6678f81af6 100644
@@ -4,15 +4,6 @@
  */
 
 / {
-	aliases {
-		rtc0 = &rtc;
-		rtc1 = &snvs_rtc;
-	};
-
-	chosen {
-		stdout-path = "serial0:115200n8";
-	};
-
 	/* fixed crystal dedicated to mpc258x */
 	clk16m: clk16m {
 		compatible = "fixed-clock";
@@ -20,27 +11,6 @@ clk16m: clk16m {
 		clock-frequency = <16000000>;
 	};
 
-	extcon_usbc_det: usbc-det {
-		compatible = "linux,extcon-usb-gpio";
-		id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>;
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_usbc_det>;
-	};
-
-	gpio-keys {
-		compatible = "gpio-keys";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpiokeys>;
-
-		power {
-			label = "Wake-Up";
-			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>;
-			linux,code = <KEY_WAKEUP>;
-			debounce-interval = <10>;
-			wakeup-source;
-		};
-	};
-
 	reg_3v3: regulator-3v3 {
 		compatible = "regulator-fixed";
 		regulator-name = "3.3V";
@@ -148,7 +118,6 @@ &uart3 {
 };
 
 &usbotg1 {
-	extcon = <0>, <&extcon_usbc_det>;
 	status = "okay";
 };
 
arch/arm/boot/dts/imx7-colibri.dtsi +32 -0
index fa615379a117..c5a58949d664 100644
@@ -6,6 +6,11 @@
 #include <dt-bindings/pwm/pwm.h>
 
 / {
+	aliases {
+		rtc0 = &rtc;
+		rtc1 = &snvs_rtc;
+	};
+
 	backlight: backlight {
 		brightness-levels = <0 45 63 88 119 158 203 255>;
 		compatible = "pwm-backlight";
@@ -18,6 +23,32 @@ backlight: backlight {
 		status = "disabled";
 	};
 
+	chosen {
+		stdout-path = "serial0:115200n8";
+	};
+
+	extcon_usbc_det: usbc-det {
+		compatible = "linux,extcon-usb-gpio";
+		debounce = <25>;
+		id-gpio = <&gpio7 14 GPIO_ACTIVE_HIGH>; /* SODIMM 137 / USBC_DET */
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_usbc_det>;
+	};
+
+	gpio-keys {
+		compatible = "gpio-keys";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_gpiokeys>;
+
+		wakeup {
+			debounce-interval = <10>;
+			gpios = <&gpio1 1 (GPIO_ACTIVE_HIGH | GPIO_PULL_DOWN)>; /* SODIMM 45 */
+			label = "Wake-Up";
+			linux,code = <KEY_WAKEUP>;
+			wakeup-source;
+		};
+	};
+
 	panel_dpi: panel-dpi {
 		backlight = <&backlight>;
 		compatible = "edt,et057090dhu";
@@ -513,6 +544,7 @@ &uart3 {
 
 &usbotg1 {
 	dr_mode = "otg";
+	extcon = <0>, <&extcon_usbc_det>;
 };
 
 &usdhc1 {
Signature · 1 line
2.35.1
#8 lore raw

PATCH v2 8/24 ARM: dts: imx7-colibri: add ethernet aliases

In reply to Marcel Ziswiler

From: Max Krummenacher <[email protected]>

Add Ethernet aliases which is required to properly pass MAC address from bootloader.

---

(no changes since v1)

 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 6 ++++++
 arch/arm/boot/dts/imx7d-colibri.dtsi      | 6 ++++++
 2 files changed, 12 insertions(+)
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +6 -0
index 198e08409d59..e77f0b26b6fb 100644
@@ -7,6 +7,12 @@
 #include "imx7-colibri.dtsi"
 
 / {
+	aliases {
+		/* Required to properly pass MAC addresses from bootloader. */
+		ethernet0 = &fec1;
+		ethernet1 = &fec2;
+	};
+
 	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x40000000>;
arch/arm/boot/dts/imx7d-colibri.dtsi +6 -0
index 90d25c604de2..48993abacae4 100644
@@ -7,6 +7,12 @@
 #include "imx7-colibri.dtsi"
 
 / {
+	aliases {
+		/* Required to properly pass MAC addresses from bootloader. */
+		ethernet0 = &fec1;
+		ethernet1 = &fec2;
+	};
+
 	memory@80000000 {
 		device_type = "memory";
 		reg = <0x80000000 0x20000000>;
Signature · 1 line
2.35.1
#9 lore raw

PATCH v2 9/24 ARM: dts: imx7-colibri: move regulators

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Move regulators to module-level device tree given they are standard Colibri functionalities.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi     | 27 -------------
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi   | 25 ------------
 arch/arm/boot/dts/imx7-colibri.dtsi           | 39 ++++++++++++++++---
 arch/arm/boot/dts/imx7d-colibri-aster.dts     |  1 -
 .../arm/boot/dts/imx7d-colibri-emmc-aster.dts |  1 -
 .../boot/dts/imx7d-colibri-emmc-eval-v3.dts   |  1 -
 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi     |  1 +
 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts   |  1 -
 arch/arm/boot/dts/imx7d-colibri.dtsi          |  1 +
 9 files changed, 35 insertions(+), 62 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +0 -27
index c12de1861c05..440f98dc323d 100644
@@ -3,33 +3,6 @@
  * Copyright 2017-2022 Toradex
  */
 
-/ {
-	reg_3v3: regulator-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "3.3V";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
-	reg_5v0: regulator-5v0 {
-		compatible = "regulator-fixed";
-		regulator-name = "5V";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-	};
-
-	reg_usbh_vbus: regulator-usbh-vbus {
-		compatible = "regulator-fixed";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_usbh_reg>;
-		regulator-name = "VCC_USB[1-4]";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;
-		vin-supply = <&reg_5v0>;
-	};
-};
-
 &adc1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +0 -25
index 2e6678f81af6..33a9cbbca0d2 100644
@@ -10,31 +10,6 @@ clk16m: clk16m {
 		#clock-cells = <0>;
 		clock-frequency = <16000000>;
 	};
-
-	reg_3v3: regulator-3v3 {
-		compatible = "regulator-fixed";
-		regulator-name = "3.3V";
-		regulator-min-microvolt = <3300000>;
-		regulator-max-microvolt = <3300000>;
-	};
-
-	reg_5v0: regulator-5v0 {
-		compatible = "regulator-fixed";
-		regulator-name = "5V";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-	};
-
-	reg_usbh_vbus: regulator-usbh-vbus {
-		compatible = "regulator-fixed";
-		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_usbh_reg>;
-		regulator-name = "VCC_USB[1-4]";
-		regulator-min-microvolt = <5000000>;
-		regulator-max-microvolt = <5000000>;
-		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>;
-		vin-supply = <&reg_5v0>;
-	};
 };
 
 &adc1 {
arch/arm/boot/dts/imx7-colibri.dtsi +33 -6
index c5a58949d664..329638985db6 100644
@@ -62,20 +62,47 @@ lcd_panel_in: endpoint {
 		};
 	};
 
-	reg_module_3v3: regulator-module-3v3 {
+	reg_3v3: regulator-3v3 {
 		compatible = "regulator-fixed";
-		regulator-name = "+V3.3";
-		regulator-min-microvolt = <3300000>;
+		regulator-always-on;
 		regulator-max-microvolt = <3300000>;
+		regulator-min-microvolt = <3300000>;
+		regulator-name = "3.3V";
+	};
+
+	reg_5v0: regulator-5v0 {
+		compatible = "regulator-fixed";
 		regulator-always-on;
+		regulator-max-microvolt = <5000000>;
+		regulator-min-microvolt = <5000000>;
+		regulator-name = "5V";
 	};
 
-	reg_module_3v3_avdd: regulator-module-3v3-avdd {
+	reg_module_3v3: regulator-module-3v3 {
 		compatible = "regulator-fixed";
-		regulator-name = "+V3.3_AVDD_AUDIO";
-		regulator-min-microvolt = <3300000>;
+		regulator-always-on;
 		regulator-max-microvolt = <3300000>;
+		regulator-min-microvolt = <3300000>;
+		regulator-name = "+V3.3";
+	};
+
+	reg_module_3v3_avdd: regulator-module-3v3-avdd {
+		compatible = "regulator-fixed";
 		regulator-always-on;
+		regulator-max-microvolt = <3300000>;
+		regulator-min-microvolt = <3300000>;
+		regulator-name = "+V3.3_AVDD_AUDIO";
+	};
+
+	reg_usbh_vbus: regulator-usbh-vbus {
+		compatible = "regulator-fixed";
+		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; /* SODIMM 129 / USBH_PEN */
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_usbh_reg>;
+		regulator-max-microvolt = <5000000>;
+		regulator-min-microvolt = <5000000>;
+		regulator-name = "VCC_USB[1-4]";
+		vin-supply = <&reg_5v0>;
 	};
 
 	sound {
arch/arm/boot/dts/imx7d-colibri-aster.dts +0 -1
index 2ed1823c4805..cfd75e3424fa 100644
@@ -36,6 +36,5 @@ &panel_dpi {
 };
 
 &usbotg2 {
-	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts +0 -1
index 33e1034b75a4..7b4451699478 100644
@@ -17,6 +17,5 @@ / {
 };
 
 &usbotg2 {
-	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts +0 -1
index 25d8d4583289..3e84018392ee 100644
@@ -16,6 +16,5 @@ / {
 };
 
 &usbotg2 {
-	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +1 -0
index e77f0b26b6fb..45b12b0d8710 100644
@@ -47,6 +47,7 @@ &gpio6 {
 
 &usbotg2 {
 	dr_mode = "host";
+	vbus-supply = <&reg_usbh_vbus>;
 };
 
 &usdhc3 {
arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +0 -1
index 51561388fac5..7aabe5691459 100644
@@ -47,6 +47,5 @@ &pwm3 {
 };
 
 &usbotg2 {
-	vbus-supply = <&reg_usbh_vbus>;
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri.dtsi +1 -0
index 48993abacae4..d1469aa8b025 100644
@@ -29,4 +29,5 @@ &gpmi {
 
 &usbotg2 {
 	dr_mode = "host";
+	vbus-supply = <&reg_usbh_vbus>;
 };
Signature · 1 line
2.35.1
#10 lore raw

PATCH v2 10/24 ARM: dts: imx7-colibri: add delay for on-module phy supply

In reply to Marcel Ziswiler

From: Oleksandr Suvorov <[email protected]>

There is a significant time required for PHY Micrel KSZ8041 to power up. Add a delay on start-up/wake-up before the FEC starts communicating with the PHY.

LDO1 takes 6 ms, R39 + C44 takes ~100ms, the KSZ8041 datasheet asks for ~11 ms before starting any programming on the MIIM.

Counting that, add a 200 ms delay to be sure the PHY is ready for programming. Also, add the same off delay time to give the capacitor time to discharge in order to properly reset.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri.dtsi | 15 +++++++++++++--
 1 file changed, 13 insertions(+), 2 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +13 -2
index 329638985db6..09dbd262dad1 100644
@@ -94,6 +94,17 @@ reg_module_3v3_avdd: regulator-module-3v3-avdd {
 		regulator-name = "+V3.3_AVDD_AUDIO";
 	};
 
+	reg_module_3v3_eth: regulator-module-3v3-eth {
+		compatible = "regulator-fixed";
+		off-on-delay-us = <200000>;
+		regulator-name = "+V3.3_ETH";
+		regulator-min-microvolt = <3300000>;
+		regulator-max-microvolt = <3300000>;
+		regulator-boot-on;
+		startup-delay-us = <200000>;
+		vin-supply = <&reg_LDO1>;
+	};
+
 	reg_usbh_vbus: regulator-usbh-vbus {
 		compatible = "regulator-fixed";
 		gpio = <&gpio4 7 GPIO_ACTIVE_LOW>; /* SODIMM 129 / USBH_PEN */
@@ -153,7 +164,7 @@ &fec1 {
 	fsl,magic-packet;
 	phy-handle = <&ethphy0>;
 	phy-mode = "rmii";
-	phy-supply = <&reg_LDO1>;
+	phy-supply = <&reg_module_3v3_eth>;
 	pinctrl-names = "default", "sleep";
 	pinctrl-0 = <&pinctrl_enet1>;
 	pinctrl-1 = <&pinctrl_enet1_sleep>;
@@ -440,7 +451,7 @@ reg_DCDC4: DCDC4 { /* V1.35_DRAM */
 			};
 
 			reg_LDO1: LDO1 { /* PWR_EN_+V3.3_ETH */
-				regulator-min-microvolt = <1800000>;
+				regulator-min-microvolt = <3300000>;
 				regulator-max-microvolt = <3300000>;
 				regulator-boot-on;
 			};
Signature · 1 line
2.35.1
#11 lore raw

PATCH v2 11/24 ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep config

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Adding no-1-8-v property to usdhc1 to disable +1.8V signaling (UHS-I) mode on SoM dtsi level.

Clean up no-1-8-v from Aster carrier board dtsi, which is using defaults from SoM dtsi and is not UHS-I capable.

A carrier board may have a MMC/SD card slot with a switchable power supply. Add a pinctrl sleep used when the card power is off to avoid backfeeding to the card and add the "sleep" pinctrl to the usdhc1 controller.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi   |  5 +-
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi |  3 -
 arch/arm/boot/dts/imx7-colibri.dtsi         | 75 ++++++++++++++-------
 3 files changed, 51 insertions(+), 32 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +1 -4
index 440f98dc323d..f3a5cb7d6a0c 100644
@@ -61,10 +61,7 @@ &usbotg1 {
 	status = "okay";
 };
 
+/* Colibri MMC/SD */
 &usdhc1 {
-	keep-power-in-suspend;
-	no-1-8-v;
-	wakeup-source;
-	vmmc-supply = <&reg_3v3>;
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +0 -3
index 33a9cbbca0d2..618831e89ce8 100644
@@ -97,8 +97,5 @@ &usbotg1 {
 };
 
 &usdhc1 {
-	keep-power-in-suspend;
-	wakeup-source;
-	vmmc-supply = <&reg_3v3>;
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri.dtsi +50 -25

107 lines not on this page · raw message

Signature · 1 line
2.35.1
#12 lore raw

PATCH v2 12/24 ARM: dts: imx7-colibri: move rtc node

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Move I2C RTC to module-level to be enabled on carrier board-level.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi   | 11 +++++------
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 11 +++++------
 arch/arm/boot/dts/imx7-colibri.dtsi         |  7 +++++++
 3 files changed, 17 insertions(+), 12 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +5 -6
index f3a5cb7d6a0c..9796bfabe241 100644
@@ -21,12 +21,6 @@ &fec1 {
 
 &i2c4 {
 	status = "okay";
-
-	/* M41T0M6 real time clock on carrier board */
-	rtc: rtc@68 {
-		compatible = "st,m41t0";
-		reg = <0x68>;
-	};
 };
 
 &pwm1 {
@@ -45,6 +39,11 @@ &pwm4 {
 	status = "okay";
 };
 
+/* M41T0M6 real time clock */
+&rtc {
+	status = "okay";
+};
+
 &uart1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +5 -6
index 618831e89ce8..e3aac56aece8 100644
@@ -56,12 +56,6 @@ &fec1 {
 
 &i2c4 {
 	status = "okay";
-
-	/* M41T0M6 real time clock on carrier board */
-	rtc: rtc@68 {
-		compatible = "st,m41t0";
-		reg = <0x68>;
-	};
 };
 
 &pwm1 {
@@ -80,6 +74,11 @@ &pwm4 {
 	status = "okay";
 };
 
+/* M41T0M6 real time clock */
+&rtc {
+	status = "okay";
+};
+
 &uart1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri.dtsi +7 -0
index 3da9ddc06aae..da3df00c7d67 100644
@@ -507,6 +507,13 @@ atmel_mxt_ts: touchscreen@4a {
 		reset-gpios = <&gpio2 28 GPIO_ACTIVE_LOW>;      /* SODIMM 106 / RST */
 		status = "disabled";
 	};
+
+	/* M41T0M6 real time clock on carrier board */
+	rtc: rtc@68 {
+		compatible = "st,m41t0";
+		reg = <0x68>;
+		status = "disabled";
+	};
 };
 
 &lcdif {
Signature · 1 line
2.35.1
#13 lore raw

PATCH v2 13/24 ARM: dts: imx7d-colibri-emmc: add cpu1 supply

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Each cpu-core is supposed to list its supply separately, add supply for cpu1.

Fixes 2d7401f8632f ("ARM: dts: imx7d: Add cpu1 supply")

---

(no changes since v1)

 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 4 ++++
 1 file changed, 4 insertions(+)
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +4 -0
index 45b12b0d8710..2b4be7646631 100644
@@ -19,6 +19,10 @@ memory@80000000 {
 	};
 };
 
+&cpu1 {
+	cpu-supply = <&reg_DCDC2>;
+};
+
 &gpio6 {
 	gpio-line-names = "",
 			  "",
Signature · 1 line
2.35.1
#14 lore raw

PATCH v2 14/24 ARM: dts: imx7-colibri-eval-v3: correct can controller comment

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Correct CAN controller comment. It is a MCP2515 rather than a mpc258x.

Fixes 66d59b678a87 ("ARM: dts: imx7-colibri: add MCP2515 CAN controller")

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +1 -1
index e3aac56aece8..069f56272546 100644
@@ -4,7 +4,7 @@
  */
 
 / {
-	/* fixed crystal dedicated to mpc258x */
+	/* Fixed crystal dedicated to MCP2515. */
 	clk16m: clk16m {
 		compatible = "fixed-clock";
 		#clock-cells = <0>;
Signature · 1 line
2.35.1
#15 lore raw

PATCH v2 15/24 ARM: dts: imx7-colibri: disable adc2

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

ADC2 is not available as it conflicts with the AD7879 resistive touchscreen.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi   | 8 --------
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 4 ----
 arch/arm/boot/dts/imx7-colibri.dtsi         | 3 ++-
 3 files changed, 2 insertions(+), 13 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +0 -8
index 9796bfabe241..a89c868ff3ed 100644
@@ -7,14 +7,6 @@ &adc1 {
 	status = "okay";
 };
 
-/*
- * ADC2 is not available on the Aster board and
- * conflicts with AD7879 resistive touchscreen.
- */
-&adc2 {
-	status = "disabled";
-};
-
 &fec1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +0 -4
index 069f56272546..6ae38c1f38d4 100644
@@ -16,10 +16,6 @@ &adc1 {
 	status = "okay";
 };
 
-&adc2 {
-	status = "okay";
-};
-
 /*
  * The Atmel maxtouch controller uses SODIMM 28/30, also used for PWM<B>, PWM<C>, aka pwm2, pwm3.
  * So if you enable following capacitive touch controller, disable pwm2/pwm3 first.
arch/arm/boot/dts/imx7-colibri.dtsi +2 -1
index da3df00c7d67..0fc4b33d97be 100644
@@ -137,8 +137,9 @@ &adc1 {
 	vref-supply = <&reg_DCDC3>;
 };
 
+/* ADC2 is not available as it conflicts with AD7879 resistive touchscreen. */
 &adc2 {
-	vref-supply = <&reg_DCDC3>;
+	status = "disabled";
 };
 
 &cpu0 {
Signature · 1 line
2.35.1
#16 lore raw

PATCH v2 16/24 ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pins

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add Colibri SSP aka SPI chip select (CS) aka slave select (SS) pins as either used on Arduino UNO compatible header X18 or Raspberry Pi compatible header X20.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi | 10 ++++++++++
 1 file changed, 10 insertions(+)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +10 -0
index a89c868ff3ed..117965705814 100644
@@ -7,6 +7,16 @@ &adc1 {
 	status = "okay";
 };
 
+/* Colibri SSP */
+&ecspi3 {
+	cs-gpios = <
+		&gpio4 11 GPIO_ACTIVE_LOW /* SODIMM 86 / regular SSPFRM as UNO_SPI_CS or  */
+		&gpio4 23 GPIO_ACTIVE_LOW /* SODIMM 65 / already muxed pinctrl_gpio2 as SPI_CE0_N */
+		&gpio4 22 GPIO_ACTIVE_LOW /* SODIMM 85 / already muxed pinctrl_gpio2 as SPI_CE1_N */
+	>;
+	status = "okay";
+};
+
 &fec1 {
 	status = "okay";
 };
Signature · 1 line
2.35.1
#17 lore raw

PATCH v2 17/24 ARM: dts: imx7-colibri: add clarifying comments

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

- Add clarifying comments.
- Remove spurious new line.
- Add required new line.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-aster.dtsi     |  11 ++
 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi   |  15 ++
 arch/arm/boot/dts/imx7-colibri.dtsi           | 140 ++++++++++--------
 arch/arm/boot/dts/imx7d-colibri-aster.dts     |   2 +-
 .../arm/boot/dts/imx7d-colibri-emmc-aster.dts |   1 +
 .../boot/dts/imx7d-colibri-emmc-eval-v3.dts   |   1 +
 arch/arm/boot/dts/imx7d-colibri-emmc.dtsi     |   2 +
 arch/arm/boot/dts/imx7d-colibri-eval-v3.dts   |   5 +
 arch/arm/boot/dts/imx7d-colibri.dtsi          |   2 +
 arch/arm/boot/dts/imx7s-colibri-eval-v3.dts   |   4 +
 arch/arm/boot/dts/imx7s-colibri.dtsi          |   1 +
 11 files changed, 121 insertions(+), 63 deletions(-)
arch/arm/boot/dts/imx7-colibri-aster.dtsi +11 -0
index 117965705814..fa488a6de0d4 100644
@@ -3,6 +3,7 @@
  * Copyright 2017-2022 Toradex
  */
 
+/* Colibri AD0 to AD3 */
 &adc1 {
 	status = "okay";
 };
@@ -17,26 +18,32 @@ &gpio4 22 GPIO_ACTIVE_LOW /* SODIMM 85 / already muxed pinctrl_gpio2 as SPI_CE1_
 	status = "okay";
 };
 
+/* Colibri Fast Ethernet */
 &fec1 {
 	status = "okay";
 };
 
+/* Colibri I2C: I2C3_SDA/SCL on SODIMM 194/196 */
 &i2c4 {
 	status = "okay";
 };
 
+/* Colibri PWM<A> */
 &pwm1 {
 	status = "okay";
 };
 
+/* Colibri PWM<B> */
 &pwm2 {
 	status = "okay";
 };
 
+/* Colibri PWM<C> */
 &pwm3 {
 	status = "okay";
 };
 
+/* Colibri PWM<D> */
 &pwm4 {
 	status = "okay";
 };
@@ -46,18 +53,22 @@ &rtc {
 	status = "okay";
 };
 
+/* Colibri UART_A */
 &uart1 {
 	status = "okay";
 };
 
+/* Colibri UART_B */
 &uart2 {
 	status = "okay";
 };
 
+/* Colibri UART_C */
 &uart3 {
 	status = "okay";
 };
 
+/* Colibri USBC */
 &usbotg1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +15 -0
index 6ae38c1f38d4..441331b09fb4 100644
@@ -12,6 +12,7 @@ clk16m: clk16m {
 	};
 };
 
+/* Colibri AD0 to AD3 */
 &adc1 {
 	status = "okay";
 };
@@ -28,6 +29,7 @@ &atmel_mxt_ts {
 	status = "disabled";
 };
 
+/* Colibri SSP */
 &ecspi3 {
 	status = "okay";
 
@@ -46,26 +48,34 @@ mcp2515: can@0 {
 	};
 };
 
+/* Colibri Fast Ethernet */
 &fec1 {
 	status = "okay";
 };
 
+/* Colibri I2C: I2C3_SDA/SCL on SODIMM 194/196 */
 &i2c4 {
 	status = "okay";
 };
 
+/* Colibri PWM<A> */
 &pwm1 {
 	status = "okay";
 };
 
+/* Colibri PWM<B> */
 &pwm2 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
+/* Colibri PWM<C> */
 &pwm3 {
+	/* The pwm3 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
+/* Colibri PWM<D> */
 &pwm4 {
 	status = "okay";
 };
@@ -75,22 +85,27 @@ &rtc {
 	status = "okay";
 };
 
+/* Colibri UART_A */
 &uart1 {
 	status = "okay";
 };
 
+/* Colibri UART_B */
 &uart2 {
 	status = "okay";
 };
 
+/* Colibri UART_C */
 &uart3 {
 	status = "okay";
 };
 
+/* Colibri USBC */
 &usbotg1 {
 	status = "okay";
 };
 
+/* Colibri MMC/SD */
 &usdhc1 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7-colibri.dtsi +78 -62

350 lines not on this page · raw message

arch/arm/boot/dts/imx7d-colibri-aster.dts +1 -1
index cfd75e3424fa..90aaeddfb4f6 100644
@@ -1,7 +1,6 @@
 // SPDX-License-Identifier: GPL-2.0-or-later OR MIT
 /*
  * Copyright 2017-2022 Toradex
- *
  */
 
 /dts-v1/;
@@ -35,6 +34,7 @@ &panel_dpi {
 	status = "okay";
 };
 
+/* Colibri USBH */
 &usbotg2 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts +1 -0
index 7b4451699478..3ec9ef6baaa4 100644
@@ -16,6 +16,7 @@ / {
 		     "fsl,imx7d";
 };
 
+/* Colibri USBH */
 &usbotg2 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts +1 -0
index 3e84018392ee..6d505cb02aad 100644
@@ -15,6 +15,7 @@ / {
 		     "fsl,imx7d";
 };
 
+/* Colibri USBH */
 &usbotg2 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri-emmc.dtsi +2 -0
index 2b4be7646631..2fb4d2133a1b 100644
@@ -49,11 +49,13 @@ &gpio6 {
 			  "SODIMM_34";
 };
 
+/* Colibri USBH */
 &usbotg2 {
 	dr_mode = "host";
 	vbus-supply = <&reg_usbh_vbus>;
 };
 
+/* eMMC */
 &usdhc3 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri-eval-v3.dts +5 -0
index 7aabe5691459..c7a8b5aa2408 100644
@@ -38,14 +38,19 @@ &panel_dpi {
 	status = "okay";
 };
 
+/* Colibri PWM<B> */
 &pwm2 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
+/* Colibri PWM<C> */
 &pwm3 {
+	/* The pwm3 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
+/* Colibri USBH */
 &usbotg2 {
 	status = "okay";
 };
arch/arm/boot/dts/imx7d-colibri.dtsi +2 -0
index d1469aa8b025..531a45b176a1 100644
@@ -23,10 +23,12 @@ &cpu1 {
 	cpu-supply = <&reg_DCDC2>;
 };
 
+/* NAND */
 &gpmi {
 	status = "okay";
 };
 
+/* Colibri USBH */
 &usbotg2 {
 	dr_mode = "host";
 	vbus-supply = <&reg_usbh_vbus>;
arch/arm/boot/dts/imx7s-colibri-eval-v3.dts +4 -0
index 6589c4179177..38de76630d6a 100644
@@ -38,10 +38,14 @@ &panel_dpi {
 	status = "okay";
 };
 
+/* Colibri PWM<B> */
 &pwm2 {
+	/* The pwm2 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
 
+/* Colibri PWM<C> */
 &pwm3 {
+	/* The pwm3 should be disabled to enable atmel_mxt_ts touchscreen for adapter. */
 	status = "okay";
 };
arch/arm/boot/dts/imx7s-colibri.dtsi +1 -0
index 2ce102b7f5d4..ef51395d3537 100644
@@ -13,6 +13,7 @@ memory@80000000 {
 	};
 };
 
+/* NAND */
 &gpmi {
 	status = "okay";
 };
Signature · 1 line
2.35.1
#18 lore raw

PATCH v2 18/24 ARM: dts: imx7-colibri: alphabetical re-order

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Alphabetically re-order device tree iomuxc pinctrl pads, nodes and properties.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi |   6 +-
 arch/arm/boot/dts/imx7-colibri.dtsi         | 368 ++++++++++----------
 2 files changed, 186 insertions(+), 188 deletions(-)
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +3 -3
index 441331b09fb4..fea6e4c0d4d6 100644
@@ -34,13 +34,13 @@ &ecspi3 {
 	status = "okay";
 
 	mcp2515: can@0 {
+		clocks = <&clk16m>;
 		compatible = "microchip,mcp2515";
+		interrupt-parent = <&gpio5>;
+		interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_can_int>;
 		reg = <0>;
-		clocks = <&clk16m>;
-		interrupt-parent = <&gpio5>;
-		interrupts = <2 IRQ_TYPE_EDGE_FALLING>;
 		spi-max-frequency = <10000000>;
 		vdd-supply = <&reg_3v3>;
 		xceiver-supply = <&reg_5v0>;
arch/arm/boot/dts/imx7-colibri.dtsi +183 -185

647 lines not on this page · raw message

Signature · 1 line
2.35.1
#19 lore raw

PATCH v2 19/24 ARM: dts: imx7-colibri: clean-up device enabling/disabling

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Disable most nodes on module-level to be enabled on carrier board-level.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 1 -
 arch/arm/boot/dts/imx7-colibri.dtsi         | 5 -----
 2 files changed, 6 deletions(-)
arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi +0 -1
index fea6e4c0d4d6..826f13da5b81 100644
@@ -44,7 +44,6 @@ mcp2515: can@0 {
 		spi-max-frequency = <10000000>;
 		vdd-supply = <&reg_3v3>;
 		xceiver-supply = <&reg_5v0>;
-		status = "okay";
 	};
 };
 
arch/arm/boot/dts/imx7-colibri.dtsi +0 -5
index f29096fca54d..065d8f55f326 100644
@@ -140,9 +140,6 @@ &adc1 {
 };
 
 /* ADC2 is not available as it conflicts with AD7879 resistive touchscreen. */
-&adc2 {
-	status = "disabled";
-};
 
 &cpu0 {
 	cpu-supply = <&reg_DCDC2>;
@@ -191,13 +188,11 @@ ethphy0: ethernet-phy@0 {
 &flexcan1 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_flexcan1>;
-	status = "disabled";
 };
 
 &flexcan2 {
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_flexcan2>;
-	status = "disabled";
 };
 
 &gpio1 {
Signature · 1 line
2.35.1
#20 lore raw

PATCH v2 20/24 ARM: dts: imx7-colibri: remove leading zero from reg address

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Remove the unnecessary leading zero from the reg address.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri.dtsi | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
arch/arm/boot/dts/imx7-colibri.dtsi +1 -1
index 065d8f55f326..cbe4f072d4ef 100644
@@ -398,7 +398,7 @@ codec: sgtl5000@a {
 		compatible = "fsl,sgtl5000";
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_sai1_mclk>;
-		reg = <0x0a>;
+		reg = <0xa>;
 		VDDA-supply = <&reg_module_3v3_avdd>;
 		VDDD-supply = <&reg_DCDC3>;
 		VDDIO-supply = <&reg_module_3v3>;
Signature · 1 line
2.35.1
#21 lore raw

PATCH v2 21/24 ARM: dts: imx7-colibri: set regulator-name properties

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Migrate comments to proper regulator-name properties.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri.dtsi | 27 ++++++++++++++++++---------
 1 file changed, 18 insertions(+), 9 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +18 -9
index cbe4f072d4ef..27706a2bc3c4 100644
@@ -424,66 +424,75 @@ pmic@33 {
 		reg = <0x33>;
 
 		regulators {
-			reg_DCDC1: DCDC1 {  /* V1.0_SOC */
+			reg_DCDC1: DCDC1 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <1100000>;
 				regulator-min-microvolt = <1000000>;
+				regulator-name = "+V1.0_SOC";
 			};
 
-			reg_DCDC2: DCDC2 { /* V1.1_ARM */
+			reg_DCDC2: DCDC2 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <1100000>;
 				regulator-min-microvolt = <975000>;
+				regulator-name = "+V1.1_ARM";
 			};
 
-			reg_DCDC3: DCDC3 { /* V1.8 */
+			reg_DCDC3: DCDC3 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <1800000>;
 				regulator-min-microvolt = <1800000>;
+				regulator-name = "+V1.8";
 			};
 
-			reg_DCDC4: DCDC4 { /* V1.35_DRAM */
+			reg_DCDC4: DCDC4 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <1350000>;
 				regulator-min-microvolt = <1350000>;
+				regulator-name = "+V1.35_DRAM";
 			};
 
-			reg_LDO1: LDO1 { /* PWR_EN_+V3.3_ETH */
+			reg_LDO1: LDO1 {
 				regulator-boot-on;
 				regulator-max-microvolt = <3300000>;
 				regulator-min-microvolt = <3300000>;
+				regulator-name = "PWR_EN_+V3.3_ETH";
 			};
 
-			reg_LDO2: LDO2 { /* +V1.8_SD */
+			reg_LDO2: LDO2 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <3300000>;
 				regulator-min-microvolt = <1800000>;
+				regulator-name = "+V1.8_SD";
 			};
 
-			reg_LDO3: LDO3 { /* PWR_EN_+V3.3_LPSR */
+			reg_LDO3: LDO3 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <3300000>;
 				regulator-min-microvolt = <3300000>;
+				regulator-name = "PWR_EN_+V3.3_LPSR";
 			};
 
-			reg_LDO4: LDO4 { /* V1.8_LPSR */
+			reg_LDO4: LDO4 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <1800000>;
 				regulator-min-microvolt = <1800000>;
+				regulator-name = "+V1.8_LPSR";
 			};
 
-			reg_LDO5: LDO5 { /* PWR_EN_+V3.3 */
+			reg_LDO5: LDO5 {
 				regulator-always-on;
 				regulator-boot-on;
 				regulator-max-microvolt = <3300000>;
 				regulator-min-microvolt = <3300000>;
+				regulator-name = "PWR_EN_+V3.3";
 			};
 		};
 	};
Signature · 1 line
2.35.1
#22 lore raw

PATCH v2 22/24 ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group naming

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Clean-up iomuxc pinctrl group naming.

---

(no changes since v1)

 arch/arm/boot/dts/imx7-colibri.dtsi | 70 ++++++++++++++---------------
 1 file changed, 35 insertions(+), 35 deletions(-)
arch/arm/boot/dts/imx7-colibri.dtsi +35 -35
index 27706a2bc3c4..a8c31ee65623 100644
@@ -667,13 +667,13 @@ MX7D_PAD_EPDC_DATA15__GPIO2_IO15	0x74 /* SODIMM 107 / INT */
 		>;
 	};
 
-	pinctrl_can_int: can-int-grp {
+	pinctrl_can_int: canintgrp {
 		fsl,pins = <
 			MX7D_PAD_SD1_RESET_B__GPIO5_IO2		0X14 /* SODIMM 73 */
 		>;
 	};
 
-	pinctrl_ecspi3: ecspi3-grp {
+	pinctrl_ecspi3: ecspi3grp {
 		fsl,pins = <
 			MX7D_PAD_I2C1_SCL__ECSPI3_MISO		0x2 /* SODIMM 90 */
 			MX7D_PAD_I2C1_SDA__ECSPI3_MOSI		0x2 /* SODIMM 92 */
@@ -681,7 +681,7 @@ MX7D_PAD_I2C2_SCL__ECSPI3_SCLK		0x2 /* SODIMM 88 */
 		>;
 	};
 
-	pinctrl_ecspi3_cs: ecspi3-cs-grp {
+	pinctrl_ecspi3_cs: ecspi3csgrp {
 		fsl,pins = <
 			MX7D_PAD_I2C2_SDA__GPIO4_IO11		0x14 /* SODIMM 86 */
 		>;
@@ -702,7 +702,7 @@ MX7D_PAD_SD2_WP__ENET1_MDC			0x3
 		>;
 	};
 
-	pinctrl_enet1_sleep: enet1sleepgrp {
+	pinctrl_enet1_sleep: enet1-sleepgrp {
 		fsl,pins = <
 			MX7D_PAD_ENET1_RGMII_RD0__GPIO7_IO0		0x0
 			MX7D_PAD_ENET1_RGMII_RD1__GPIO7_IO1		0x0
@@ -717,21 +717,21 @@ MX7D_PAD_SD2_WP__GPIO5_IO10			0x0
 		>;
 	};
 
-	pinctrl_flexcan1: flexcan1-grp {
+	pinctrl_flexcan1: flexcan1grp {
 		fsl,pins = <
 			MX7D_PAD_ENET1_RGMII_RD2__FLEXCAN1_RX	0x79 /* SODIMM 63 */
 			MX7D_PAD_ENET1_RGMII_RD3__FLEXCAN1_TX	0x79 /* SODIMM 55 */
 		>;
 	};
 
-	pinctrl_flexcan2: flexcan2-grp {
+	pinctrl_flexcan2: flexcan2grp {
 		fsl,pins = <
 			MX7D_PAD_GPIO1_IO14__FLEXCAN2_RX	0x79 /* SODIMM 188 */
 			MX7D_PAD_GPIO1_IO15__FLEXCAN2_TX	0x79 /* SODIMM 178 */
 		>;
 	};
 
-	pinctrl_gpio1: gpio1-grp {
+	pinctrl_gpio1: gpio1grp {
 		fsl,pins = <
 			MX7D_PAD_EPDC_BDR1__GPIO2_IO29		0x14 /* SODIMM 110 */
 			MX7D_PAD_EPDC_DATA00__GPIO2_IO0		0x14 /* SODIMM 111 */
@@ -774,7 +774,7 @@ MX7D_PAD_UART3_RTS_B__GPIO4_IO6		0x14 /* SODIMM 131 */
 		>;
 	};
 
-	pinctrl_gpio2: gpio2-grp { /* On X22 Camera interface */
+	pinctrl_gpio2: gpio2grp { /* On X22 Camera interface */
 		fsl,pins = <
 			MX7D_PAD_ECSPI1_MISO__GPIO4_IO18	0x14 /* SODIMM 79 */
 			MX7D_PAD_ECSPI1_MOSI__GPIO4_IO17	0x14 /* SODIMM 103 */
@@ -791,7 +791,7 @@ MX7D_PAD_SD2_RESET_B__GPIO5_IO11	0x14 /* SODIMM 98 */
 		>;
 	};
 
-	pinctrl_gpio3: gpio3-grp { /* LCD 18-23 */
+	pinctrl_gpio3: gpio3grp { /* LCD 18-23 */
 		fsl,pins = <
 			MX7D_PAD_LCD_DATA18__GPIO3_IO23		0x14 /* SODIMM 136 */
 			MX7D_PAD_LCD_DATA19__GPIO3_IO24		0x14 /* SODIMM 138 */
@@ -802,27 +802,27 @@ MX7D_PAD_LCD_DATA23__GPIO3_IO28		0x74 /* SODIMM 146 */
 		>;
 	};
 
-	pinctrl_gpio4: gpio4-grp { /* Alternatively CAN2 */
+	pinctrl_gpio4: gpio4grp { /* Alternatively CAN2 */
 		fsl,pins = <
 			MX7D_PAD_GPIO1_IO14__GPIO1_IO14		0x14 /* SODIMM 188 */
 			MX7D_PAD_GPIO1_IO15__GPIO1_IO15		0x14 /* SODIMM 178 */
 		>;
 	};
 
-	pinctrl_gpio7: gpio7-grp { /* Alternatively CAN1 */
+	pinctrl_gpio7: gpio7grp { /* Alternatively CAN1 */
 		fsl,pins = <
 			MX7D_PAD_ENET1_RGMII_RD2__GPIO7_IO2	0x14 /* SODIMM 63 */
 			MX7D_PAD_ENET1_RGMII_RD3__GPIO7_IO3	0x14 /* SODIMM 55 */
 		>;
 	};
 
-	pinctrl_gpio_bl_on: gpio-bl-on {
+	pinctrl_gpio_bl_on: gpioblongrp {
 		fsl,pins = <
 			MX7D_PAD_SD1_WP__GPIO5_IO1		0x14 /* SODIMM 71 */
 		>;
 	};
 
-	pinctrl_gpmi_nand: gpmi-nand-grp {
+	pinctrl_gpmi_nand: gpminandgrp {
 		fsl,pins = <
 			MX7D_PAD_SAI1_TX_BCLK__NAND_CE0_B	0x71
 			MX7D_PAD_SAI1_TX_DATA__NAND_READY_B	0x74
@@ -841,13 +841,13 @@ MX7D_PAD_SD3_STROBE__NAND_RE_B		0x71
 		>;
 	};
 
-	pinctrl_i2c1_int: i2c1-int-grp { /* PMIC / TOUCH */
+	pinctrl_i2c1_int: i2c1intgrp { /* PMIC / TOUCH */
 		fsl,pins = <
 			MX7D_PAD_GPIO1_IO13__GPIO1_IO13	0x79
 		>;
 	};
 
-	pinctrl_i2c4: i2c4-grp {
+	pinctrl_i2c4: i2c4grp {
 		fsl,pins = <
 			MX7D_PAD_ENET1_RGMII_TD2__I2C4_SCL	0x4000007f /* SODIMM 196 */
 			MX7D_PAD_ENET1_RGMII_TD3__I2C4_SDA	0x4000007f /* SODIMM 194 */
@@ -861,7 +861,7 @@ MX7D_PAD_ENET1_RGMII_TD3__GPIO7_IO9	0x4000007f
 		>;
 	};
 
-	pinctrl_lcdif_dat: lcdif-dat-grp {
+	pinctrl_lcdif_dat: lcdifdatgrp {
 		fsl,pins = <
 			MX7D_PAD_LCD_DATA00__LCD_DATA0		0x79 /* SODIMM 76 */
 			MX7D_PAD_LCD_DATA01__LCD_DATA1		0x79 /* SODIMM 70 */
@@ -884,7 +884,7 @@ MX7D_PAD_LCD_DATA17__LCD_DATA17		0x79 /* SODIMM 61 */
 		>;
 	};
 
-	pinctrl_lcdif_dat_24: lcdif-dat-24-grp {
+	pinctrl_lcdif_dat_24: lcdifdat24grp {
 		fsl,pins = <
 			MX7D_PAD_LCD_DATA18__LCD_DATA18		0x79 /* SODIMM 136 */
 			MX7D_PAD_LCD_DATA19__LCD_DATA19		0x79 /* SODIMM 138 */
@@ -895,7 +895,7 @@ MX7D_PAD_LCD_DATA23__LCD_DATA23		0x79 /* SODIMM 146 */
 		>;
 	};
 
-	pinctrl_lcdif_ctrl: lcdif-ctrl-grp {
+	pinctrl_lcdif_ctrl: lcdifctrlgrp {
 		fsl,pins = <
 			MX7D_PAD_LCD_CLK__LCD_CLK		0x79 /* SODIMM 56 */
 			MX7D_PAD_LCD_ENABLE__LCD_ENABLE		0x79 /* SODIMM 44 */
@@ -913,33 +913,33 @@ MX7D_PAD_EPDC_DATA13__GPIO2_IO13        0x14 /* SODIMM 95 */
 		>;
 	};
 
-	pinctrl_pwm1: pwm1-grp {
+	pinctrl_pwm1: pwm1grp {
 		fsl,pins = <
 			MX7D_PAD_ECSPI2_MOSI__GPIO4_IO21	0x4  /* SODIMM 59 */
 			MX7D_PAD_GPIO1_IO08__PWM1_OUT		0x79 /* SODIMM 59 */
 		>;
 	};
 
-	pinctrl_pwm2: pwm2-grp {
+	pinctrl_pwm2: pwm2grp {
 		fsl,pins = <
 			MX7D_PAD_GPIO1_IO09__PWM2_OUT		0x79 /* SODIMM 28 */
 		>;
 	};
 
-	pinctrl_pwm3: pwm3-grp {
+	pinctrl_pwm3: pwm3grp {
 		fsl,pins = <
 			MX7D_PAD_GPIO1_IO10__PWM3_OUT		0x79 /* SODIMM 30 */
 		>;
 	};
 
-	pinctrl_pwm4: pwm4-grp {
+	pinctrl_pwm4: pwm4grp {
 		fsl,pins = <
 			MX7D_PAD_ECSPI2_SCLK__GPIO4_IO20	0x4  /* SODIMM 67 */
 			MX7D_PAD_GPIO1_IO11__PWM4_OUT		0x79 /* SODIMM 67 */
 		>;
 	};
 
-	pinctrl_uart1: uart1-grp {
+	pinctrl_uart1: uart1grp {
 		fsl,pins = <
 			MX7D_PAD_SAI2_TX_BCLK__UART1_DTE_CTS	0x79 /* SODIMM 25 */
 			MX7D_PAD_SAI2_TX_SYNC__UART1_DTE_RTS	0x79 /* SODIMM 27 */
@@ -948,14 +948,14 @@ MX7D_PAD_UART1_TX_DATA__UART1_DTE_RX	0x79 /* SODIMM 33 */
 		>;
 	};
 
-	pinctrl_uart1_ctrl1: uart1-ctrl1-grp {
+	pinctrl_uart1_ctrl1: uart1ctrl1grp {
 		fsl,pins = <
 			MX7D_PAD_SD2_DATA0__GPIO5_IO14		0x14 /* SODIMM 23 / DTR */
 			MX7D_PAD_SD2_DATA1__GPIO5_IO15		0x14 /* SODIMM 31 / DCD */
 		>;
 	};
 
-	pinctrl_uart2: uart2-grp {
+	pinctrl_uart2: uart2grp {
 		fsl,pins = <
 			MX7D_PAD_SAI2_RX_DATA__UART2_DTE_RTS	0x79 /* SODIMM 32 / CTS */
 			MX7D_PAD_SAI2_TX_DATA__UART2_DTE_CTS	0x79 /* SODIMM 34 / RTS */
@@ -963,20 +963,20 @@ MX7D_PAD_UART2_RX_DATA__UART2_DTE_TX	0x79 /* SODIMM 38 */
 			MX7D_PAD_UART2_TX_DATA__UART2_DTE_RX	0x79 /* SODIMM 36 */
 		>;
 	};
-	pinctrl_uart3: uart3-grp {
+	pinctrl_uart3: uart3grp {
 		fsl,pins = <
 			MX7D_PAD_UART3_RX_DATA__UART3_DTE_TX	0x79 /* SODIMM 21 */
 			MX7D_PAD_UART3_TX_DATA__UART3_DTE_RX	0x79 /* SODIMM 19 */
 		>;
 	};
 
-	pinctrl_usbc_det: gpio-usbc-det {
+	pinctrl_usbc_det: usbcdetgrp {
 		fsl,pins = <
 			MX7D_PAD_ENET1_CRS__GPIO7_IO14		0x14 /* SODIMM 137 / USBC_DET */
 		>;
 	};
 
-	pinctrl_usbh_reg: gpio-usbh-vbus {
+	pinctrl_usbh_reg: usbhreggrp {
 		fsl,pins = <
 			MX7D_PAD_UART3_CTS_B__GPIO4_IO7		0x14 /* SODIMM 129 / USBH_PEN */
 		>;
@@ -1043,7 +1043,7 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE         0x19
 		>;
 	};
 
-	pinctrl_usdhc3_100mhz: usdhc3grp_100mhz {
+	pinctrl_usdhc3_100mhz: usdhc3-100mhzgrp {
 		fsl,pins = <
 			MX7D_PAD_SD3_CLK__SD3_CLK		0x1a
 			MX7D_PAD_SD3_CMD__SD3_CMD		0x5a
@@ -1059,7 +1059,7 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE         0x1a
 		>;
 	};
 
-	pinctrl_usdhc3_200mhz: usdhc3grp_200mhz {
+	pinctrl_usdhc3_200mhz: usdhc3-200mhzgrp {
 		fsl,pins = <
 			MX7D_PAD_SD3_CLK__SD3_CLK		0x1b
 			MX7D_PAD_SD3_CMD__SD3_CMD		0x5b
@@ -1075,7 +1075,7 @@ MX7D_PAD_SD3_STROBE__SD3_STROBE         0x1b
 		>;
 	};
 
-	pinctrl_sai1: sai1-grp {
+	pinctrl_sai1: sai1grp {
 		fsl,pins = <
 			MX7D_PAD_ENET1_COL__SAI1_TX_DATA0	0x30
 			MX7D_PAD_ENET1_RX_CLK__SAI1_TX_BCLK     0x1f
@@ -1084,7 +1084,7 @@ MX7D_PAD_SAI1_TX_SYNC__SAI1_TX_SYNC	0x1f
 		>;
 	};
 
-	pinctrl_sai1_mclk: sai1grp_mclk {
+	pinctrl_sai1_mclk: sai1mclkgrp {
 		fsl,pins = <
 			MX7D_PAD_SAI1_MCLK__SAI1_MCLK           0x1f
 		>;
@@ -1107,7 +1107,7 @@ MX7D_PAD_LPSR_GPIO1_IO00__GPIO1_IO0	0x0
 		>;
 	};
 
-	pinctrl_gpio_lpsr: gpio1-grp {
+	pinctrl_gpio_lpsr: gpiolpsrgrp {
 		fsl,pins = <
 			MX7D_PAD_LPSR_GPIO1_IO02__GPIO1_IO2	0x59 /* SODIMM 135 */
 			MX7D_PAD_LPSR_GPIO1_IO03__GPIO1_IO3	0x59 /* SODIMM 22 */
@@ -1120,7 +1120,7 @@ MX7D_PAD_LPSR_GPIO1_IO01__GPIO1_IO1	0x19 /* SODIMM 45 / WAKE_UP */
 		>;
 	};
 
-	pinctrl_i2c1: i2c1-grp {
+	pinctrl_i2c1: i2c1grp {
 		fsl,pins = <
 			MX7D_PAD_LPSR_GPIO1_IO04__I2C1_SCL	0x4000007f
 			MX7D_PAD_LPSR_GPIO1_IO05__I2C1_SDA	0x4000007f
@@ -1134,7 +1134,7 @@ MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5	0x4000007f
 		>;
 	};
 
-	pinctrl_uart1_ctrl2: uart1-ctrl2-grp {
+	pinctrl_uart1_ctrl2: uart1ctrl2grp {
 		fsl,pins = <
 			MX7D_PAD_LPSR_GPIO1_IO06__GPIO1_IO6	0x14 /* SODIMM 37 / RI */
 			MX7D_PAD_LPSR_GPIO1_IO07__GPIO1_IO7	0x14 /* SODIMM 29 / DSR */
Signature · 1 line
2.35.1
#23 lore raw

PATCH v2 23/24 dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Based on toradex,colibri-imx7s, toradex,colibri-imx7d and toradex,colibri-imx7d-emmc module device trees add iris and iris-v2 for carrier board dts.

---

Changes in v2:
- Add Krzysztof's acked-by. Thanks!

 Documentation/devicetree/bindings/arm/fsl.yaml | 6 ++++++
 1 file changed, 6 insertions(+)
Documentation/devicetree/bindings/arm/fsl.yaml +6 -0
index ef524378d449..17f38cc8d5ee 100644
@@ -738,6 +738,8 @@ properties:
           - enum:
               - toradex,colibri-imx7s-aster     # Module on Aster Carrier Board
               - toradex,colibri-imx7s-eval-v3   # Module on Colibri Evaluation Board V3
+              - toradex,colibri-imx7s-iris      # Module on Iris Carrier Board
+              - toradex,colibri-imx7s-iris-v2   # Module on Iris Carrier Board V2
           - const: toradex,colibri-imx7s
           - const: fsl,imx7s
 
@@ -791,6 +793,8 @@ properties:
           - enum:
               - toradex,colibri-imx7d-aster   # Colibri iMX7D Module on Aster Carrier Board
               - toradex,colibri-imx7d-eval-v3 # Colibri iMX7D Module on Colibri Evaluation Board V3
+              - toradex,colibri-imx7d-iris    # Colibri iMX7D Module on Iris Carrier Board
+              - toradex,colibri-imx7d-iris-v2 # Colibri iMX7D Module on Iris Carrier Board V2
           - const: toradex,colibri-imx7d
           - const: fsl,imx7d
 
@@ -799,6 +803,8 @@ properties:
           - enum:
               - toradex,colibri-imx7d-emmc-aster    # Module on Aster Carrier Board
               - toradex,colibri-imx7d-emmc-eval-v3  # Module on Colibri Evaluation Board V3
+              - toradex,colibri-imx7d-emmc-iris     # Module on Iris Carrier Board
+              - toradex,colibri-imx7d-emmc-iris-v2  # Module on Iris Carrier Board V2
           - const: toradex,colibri-imx7d-emmc
           - const: fsl,imx7d
 
Signature · 1 line
2.35.1
#24 lore raw

PATCH v2 24/24 ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards

In reply to Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

Add support for Toradex Iris, small form-factor Pico-ITX Colibri Arm Computer Module family Carrier Board.

Additional details available at
https://www.toradex.com/products/carrier-board/iris-carrier-board

---

Changes in v2:
- Revert change on arch/arm/boot/dts/imx6dl-colibri-iris.dts which slipped into this patch set by error.
- Re-based on top of Shawn's for-next.

 arch/arm/boot/dts/Makefile                    |   6 +
 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi   | 112 ++++++++++++++++++
 arch/arm/boot/dts/imx7-colibri-iris.dtsi      | 108 +++++++++++++++++
 .../boot/dts/imx7d-colibri-emmc-iris-v2.dts   |  21 ++++
 arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts |  21 ++++
 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts   |  83 +++++++++++++
 arch/arm/boot/dts/imx7d-colibri-iris.dts      |  56 +++++++++
 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts   |  78 ++++++++++++
 arch/arm/boot/dts/imx7s-colibri-iris.dts      |  51 ++++++++
 9 files changed, 536 insertions(+)
 create mode 100644 arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi
 create mode 100644 arch/arm/boot/dts/imx7-colibri-iris.dtsi
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris-v2.dts
 create mode 100644 arch/arm/boot/dts/imx7d-colibri-iris.dts
 create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris-v2.dts
 create mode 100644 arch/arm/boot/dts/imx7s-colibri-iris.dts
arch/arm/boot/dts/Makefile +6 -0
index a496c4751c86..e8c109d5e3bd 100644
@@ -735,8 +735,12 @@ dtb-$(CONFIG_SOC_IMX7D) += \
 	imx7d-cl-som-imx7.dtb \
 	imx7d-colibri-aster.dtb \
 	imx7d-colibri-emmc-aster.dtb \
+	imx7d-colibri-emmc-iris.dtb \
+	imx7d-colibri-emmc-iris-v2.dtb \
 	imx7d-colibri-emmc-eval-v3.dtb \
 	imx7d-colibri-eval-v3.dtb \
+	imx7d-colibri-iris.dtb \
+	imx7d-colibri-iris-v2.dtb \
 	imx7d-flex-concentrator.dtb \
 	imx7d-flex-concentrator-mfg.dtb \
 	imx7d-mba7.dtb \
@@ -756,6 +760,8 @@ dtb-$(CONFIG_SOC_IMX7D) += \
 	imx7d-zii-rpu2.dtb \
 	imx7s-colibri-aster.dtb \
 	imx7s-colibri-eval-v3.dtb \
+	imx7s-colibri-iris.dtb \
+	imx7s-colibri-iris-v2.dtb \
 	imx7s-mba7.dtb \
 	imx7s-warp.dtb
 dtb-$(CONFIG_SOC_IMX7ULP) += \
arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi new file +112 -0

112 lines not on this page · raw message

arch/arm/boot/dts/imx7-colibri-iris.dtsi new file +108 -0

108 lines not on this page · raw message

arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts new file +21 -0
new file mode 100644
index 000000000000..7347659557f3
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+/dts-v1/;
+#include "imx7d-colibri-emmc.dtsi"
+#include "imx7-colibri-iris-v2.dtsi"
+
+/ {
+	model = "Toradex Colibri iMX7D 1GB on Iris V2 Carrier Board";
+	compatible = "toradex,colibri-imx7d-emmc-iris-v2",
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7d",
+		     "fsl,imx7d";
+};
+
+/* Colibri USBH */
+&usbotg2 {
+	status = "okay";
+};
arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts new file +21 -0
new file mode 100644
index 000000000000..5324c92e368d
@@ -0,0 +1,21 @@
+// SPDX-License-Identifier: GPL-2.0-or-later OR MIT
+/*
+ * Copyright 2022 Toradex
+ */
+
+/dts-v1/;
+#include "imx7d-colibri-emmc.dtsi"
+#include "imx7-colibri-iris.dtsi"
+
+/ {
+	model = "Toradex Colibri iMX7D 1GB on Iris Carrier Board";
+	compatible = "toradex,colibri-imx7d-emmc-iris",
+		     "toradex,colibri-imx7d-emmc",
+		     "toradex,colibri-imx7d",
+		     "fsl,imx7d";
+};
+
+/* Colibri USBH */
+&usbotg2 {
+	status = "okay";
+};
arch/arm/boot/dts/imx7d-colibri-iris-v2.dts new file +83 -0

83 lines not on this page · raw message

arch/arm/boot/dts/imx7d-colibri-iris.dts new file +56 -0

56 lines not on this page · raw message

arch/arm/boot/dts/imx7s-colibri-iris-v2.dts new file +78 -0

78 lines not on this page · raw message

arch/arm/boot/dts/imx7s-colibri-iris.dts new file +51 -0

51 lines not on this page · raw message

Signature · 1 line
2.35.1
Applied
#25 lore raw
In reply to Marcel Ziswiler
Quoted 90 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This is a general update of the Colibri iMX7 device tree files.

The Toradex Colibri family is composed of a SoM that can be plugged on various carrier boards, with carrier boards allowing multiple optional accessories (e.g. display, camera, ...).

The device tree sources are structured into a SoM dtsi and a carrier dts which then includes the SoM dtsi. The SoM dtsi defines and enables the functionality self-contained on the SoM and prepares for the functionality provided by the carrier HW or accessories so that the carrier dts then can enable or amend nodes provided. Accessories are enabled in overlays depending on HW configuration.

Please find the following colibri-imx7 device trees improvements:

- Display/Touch Functionality Overhaul
Rename display interface to match other modules to make it easier to use device tree overlays.
The parallel RGB interface (lcdif) and all related stuff turn on in a device tree overlay. Keep them disabled in the main devicetree. As these subsystems are provided by module and not a part of boards, move their definitions into the module-level devicetree. Disable ad7879 touchscreen which turns on in a devic tree overlay. Remains it disabled in the main devicetree.
The Toradex 7" Capacitive and 10" LVDS touch screens are Atmel MXT peripherals available on the I2C bus for touchscreen events. Add atmel_mxt_ts node to the module-level device tree. Also, provide pinmux configuration for the INT/RST inputs from SODIMM pins 106/107 for most carrier boards or an external touchscreen adapter inputs configured to SODIMM pins 28/30.

- Ethernet Improvements
Add the MDIO bus with the respective PHY.
Add Ethernet aliases which is required to properly pass MAC address from bootloader.
Add delay for on-module phy supply.

- USB Device/Host Switching
Add usb dual-role switching using extcon.

- MMC/SD
The original Colibri specification only defined 3.3 volt TTL signaling and relied on external on-carrier pull-ups for the SD_DATA[0..3] lines. The latest carrier boards like Iris V2 on the other hand are now UHS-I compliant by leaving such external on-carrier pull-ups away relying on module- or even SoC-level ones which pull up to resp. signaling voltage. In such cases, the carrier board-level device tree may explicitly delete the no-1-8-v property to enable full UHS-I support.
Also, fix SD/MMC regulator for the carrier boards using UHS-I modes.

- Add Iris and Iris V2 Carrier Board Device Trees
Add support for Toradex Iris carrier boards.

Changes in v2:
- Add Krzysztof's acked-by. Thanks!
- Revert change on arch/arm/boot/dts/imx6dl-colibri-iris.dts which slipped into this patch set by error.
- Re-based on top of Shawn's for-next.

Marcel Ziswiler (18):
ARM: dts: imx7-colibri: overhaul display/touch functionality
ARM: dts: imx7-colibri: add mdio phy node
ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys
ARM: dts: imx7-colibri: move regulators
ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep config
ARM: dts: imx7-colibri: move rtc node
ARM: dts: imx7d-colibri-emmc: add cpu1 supply
ARM: dts: imx7-colibri-eval-v3: correct can controller comment
ARM: dts: imx7-colibri: disable adc2
ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pins
ARM: dts: imx7-colibri: add clarifying comments
ARM: dts: imx7-colibri: alphabetical re-order
ARM: dts: imx7-colibri: clean-up device enabling/disabling
ARM: dts: imx7-colibri: remove leading zero from reg address
ARM: dts: imx7-colibri: set regulator-name properties
ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group naming
dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2
ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards

Max Krummenacher (1):
ARM: dts: imx7-colibri: add ethernet aliases

Oleksandr Suvorov (3):
ARM: dts: imx7-colibri: improve licensing and compatible strings
ARM: dts: imx7-colibri: improve wake-up with gpio key
ARM: dts: imx7-colibri: add delay for on-module phy supply

Quoted 5 lines

Philippe Schenker (1):
ARM: dts: imx7-colibri: add usb dual-role switching using extcon

Stefan Agner (1):
ARM: dts: imx7-colibri: set lcdif clock source to video pll

Applied all, thanks!

#26 lore raw
Quoted 92 lines · Shawn Guo
Quoted 90 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This is a general update of the Colibri iMX7 device tree files.

The Toradex Colibri family is composed of a SoM that can be plugged on various carrier boards, with carrier boards allowing multiple optional accessories (e.g. display, camera, ...).

The device tree sources are structured into a SoM dtsi and a carrier dts which then includes the SoM dtsi. The SoM dtsi defines and enables the functionality self-contained on the SoM and prepares for the functionality provided by the carrier HW or accessories so that the carrier dts then can enable or amend nodes provided. Accessories are enabled in overlays depending on HW configuration.

Please find the following colibri-imx7 device trees improvements:

- Display/Touch Functionality Overhaul
Rename display interface to match other modules to make it easier to use device tree overlays.
The parallel RGB interface (lcdif) and all related stuff turn on in a device tree overlay. Keep them disabled in the main devicetree. As these subsystems are provided by module and not a part of boards, move their definitions into the module-level devicetree. Disable ad7879 touchscreen which turns on in a devic tree overlay. Remains it disabled in the main devicetree.
The Toradex 7" Capacitive and 10" LVDS touch screens are Atmel MXT peripherals available on the I2C bus for touchscreen events. Add atmel_mxt_ts node to the module-level device tree. Also, provide pinmux configuration for the INT/RST inputs from SODIMM pins 106/107 for most carrier boards or an external touchscreen adapter inputs configured to SODIMM pins 28/30.

- Ethernet Improvements
Add the MDIO bus with the respective PHY.
Add Ethernet aliases which is required to properly pass MAC address from bootloader.
Add delay for on-module phy supply.

- USB Device/Host Switching
Add usb dual-role switching using extcon.

- MMC/SD
The original Colibri specification only defined 3.3 volt TTL signaling and relied on external on-carrier pull-ups for the SD_DATA[0..3] lines. The latest carrier boards like Iris V2 on the other hand are now UHS-I compliant by leaving such external on-carrier pull-ups away relying on module- or even SoC-level ones which pull up to resp. signaling voltage. In such cases, the carrier board-level device tree may explicitly delete the no-1-8-v property to enable full UHS-I support.
Also, fix SD/MMC regulator for the carrier boards using UHS-I modes.

- Add Iris and Iris V2 Carrier Board Device Trees
Add support for Toradex Iris carrier boards.

Changes in v2:
- Add Krzysztof's acked-by. Thanks!
- Revert change on arch/arm/boot/dts/imx6dl-colibri-iris.dts which slipped into this patch set by error.
- Re-based on top of Shawn's for-next.

Marcel Ziswiler (18):
ARM: dts: imx7-colibri: overhaul display/touch functionality
ARM: dts: imx7-colibri: add mdio phy node
ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys
ARM: dts: imx7-colibri: move regulators
ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep config
ARM: dts: imx7-colibri: move rtc node
ARM: dts: imx7d-colibri-emmc: add cpu1 supply
ARM: dts: imx7-colibri-eval-v3: correct can controller comment
ARM: dts: imx7-colibri: disable adc2
ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pins
ARM: dts: imx7-colibri: add clarifying comments
ARM: dts: imx7-colibri: alphabetical re-order
ARM: dts: imx7-colibri: clean-up device enabling/disabling
ARM: dts: imx7-colibri: remove leading zero from reg address
ARM: dts: imx7-colibri: set regulator-name properties
ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group naming
dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2
ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards

Max Krummenacher (1):
ARM: dts: imx7-colibri: add ethernet aliases

Oleksandr Suvorov (3):
ARM: dts: imx7-colibri: improve licensing and compatible strings
ARM: dts: imx7-colibri: improve wake-up with gpio key
ARM: dts: imx7-colibri: add delay for on-module phy supply

Quoted 7 lines
Quoted 5 lines

Philippe Schenker (1):
ARM: dts: imx7-colibri: add usb dual-role switching using extcon

Stefan Agner (1):
ARM: dts: imx7-colibri: set lcdif clock source to video pll

Applied all, thanks!

Not completely sure, but I think this series adds a warning to linux-next:

./Documentation/devicetree/bindings/arm/fsl.yaml:684:111: [warning] line too long (111 > 110 characters) (line-length)

#27 lore raw
Quoted 7 lines · Rob Herring
Quoted 6 lines · Shawn Guo
Quoted 4 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This is a general update of the Colibri iMX7 device tree files.

...

Quoted 6 lines
Quoted 1 line

Applied all, thanks!

Not completely sure, but I think this series adds a warning to linux-next:

./Documentation/devicetree/bindings/arm/fsl.yaml:684:111: [warning] line too long (111 > 110 characters) (line-length)

The warning is from

bb0fa1533715 ("dt-bindings: arm: fsl: correct 1g vs. 1gb in toradex,colibri-imx6ull-*")

that is already merged in master/torvalds, not related to this series.

We (Toradex) introduced it, and I guess we can easily fix it, Marcel? We'll send a patch.

Francesco

#28 lore raw
In reply to Rob Herring
Quoted 99 lines · Rob Herring
Quoted 98 lines · Shawn Guo
Quoted 95 lines · Marcel Ziswiler

From: Marcel Ziswiler <[email protected]>

This is a general update of the Colibri iMX7 device tree files.

The Toradex Colibri family is composed of a SoM that can be plugged on various carrier boards, with carrier boards allowing multiple optional accessories (e.g. display, camera, ...).

The device tree sources are structured into a SoM dtsi and a carrier dts which then includes the SoM dtsi. The SoM dtsi defines and enables the functionality self-contained on the SoM and prepares for the functionality provided by the carrier HW or accessories so that the carrier dts then can enable or amend nodes provided. Accessories are enabled in overlays depending on HW configuration.

Please find the following colibri-imx7 device trees improvements:

- Display/Touch Functionality Overhaul
Rename display interface to match other modules to make it easier to use device tree overlays.
The parallel RGB interface (lcdif) and all related stuff turn on in a device tree overlay. Keep them disabled in the main devicetree. As these subsystems are provided by module and not a part of boards, move their definitions into the module-level devicetree. Disable ad7879 touchscreen which turns on in a devic tree overlay. Remains it disabled in the main devicetree.
The Toradex 7" Capacitive and 10" LVDS touch screens are Atmel MXT peripherals available on the I2C bus for touchscreen events. Add atmel_mxt_ts node to the module-level device tree. Also, provide pinmux configuration for the INT/RST inputs from SODIMM pins 106/107 for most carrier boards or an external touchscreen adapter inputs configured to SODIMM pins 28/30.

- Ethernet Improvements
Add the MDIO bus with the respective PHY.
Add Ethernet aliases which is required to properly pass MAC address from bootloader.
Add delay for on-module phy supply.

- USB Device/Host Switching
Add usb dual-role switching using extcon.

- MMC/SD
The original Colibri specification only defined 3.3 volt TTL signaling and relied on external on-carrier pull-ups for the SD_DATA[0..3] lines. The latest carrier boards like Iris V2 on the other hand are now UHS-I compliant by leaving such external on-carrier pull-ups away relying on module- or even SoC-level ones which pull up to resp. signaling voltage. In such cases, the carrier board-level device tree may explicitly delete the no-1-8-v property to enable full UHS-I support.
Also, fix SD/MMC regulator for the carrier boards using UHS-I modes.

- Add Iris and Iris V2 Carrier Board Device Trees
Add support for Toradex Iris carrier boards.

Changes in v2:
- Add Krzysztof's acked-by. Thanks!
- Revert change on arch/arm/boot/dts/imx6dl-colibri-iris.dts which slipped into this patch set by error.
- Re-based on top of Shawn's for-next.

Marcel Ziswiler (18):
ARM: dts: imx7-colibri: overhaul display/touch functionality
ARM: dts: imx7-colibri: add mdio phy node
ARM: dts: imx7-colibri: move aliases, chosen, extcon and gpio-keys
ARM: dts: imx7-colibri: move regulators
ARM: dts: imx7-colibri: clean-up usdhc1 and add sleep config
ARM: dts: imx7-colibri: move rtc node
ARM: dts: imx7d-colibri-emmc: add cpu1 supply
ARM: dts: imx7-colibri-eval-v3: correct can controller comment
ARM: dts: imx7-colibri: disable adc2
ARM: dts: imx7-colibri-aster: add ssp aka spi cs aka ss pins
ARM: dts: imx7-colibri: add clarifying comments
ARM: dts: imx7-colibri: alphabetical re-order
ARM: dts: imx7-colibri: clean-up device enabling/disabling
ARM: dts: imx7-colibri: remove leading zero from reg address
ARM: dts: imx7-colibri: set regulator-name properties
ARM: dts: imx7-colibri: clean-up iomuxc pinctrl group naming
dt-bindings: arm: fsl: add toradex,colibri-imx7s/d/d-emmc-iris/-v2
ARM: dts: imx7-colibri: add support for Toradex Iris carrier boards

Max Krummenacher (1):
ARM: dts: imx7-colibri: add ethernet aliases

Oleksandr Suvorov (3):
ARM: dts: imx7-colibri: improve licensing and compatible strings
ARM: dts: imx7-colibri: improve wake-up with gpio key
ARM: dts: imx7-colibri: add delay for on-module phy supply

Philippe Schenker (1):
ARM: dts: imx7-colibri: add usb dual-role switching using extcon

Stefan Agner (1):
ARM: dts: imx7-colibri: set lcdif clock source to video pll

Quoted 6 lines
Quoted 1 line

Applied all, thanks!

Not completely sure, but I think this series adds a warning to linux-next:

./Documentation/devicetree/bindings/arm/fsl.yaml:684:111: [warning] line too long (111 > 110 characters) (line-length)

Thanks for spotting it, Rob!

It seems to be another separate patch [1]. I will fix it.

Shawn

[1] https://lore.kernel.org/linux-arm-kernel/[email protected]/