Skip to contentSkip to conversation

verdin-imx8mm/verdin-imx8mp: fix ctrl_sleep_moci# handling

PATCH New Marcel Ziswiler 2 participants 11 messages Jul 11, 2023 – Jul 12, 2023

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

cover verdin-imx8mm/verdin-imx8mp: fix ctrl_sleep_moci# handling

From: Marcel Ziswiler <[email protected]>

This series first synchronises the device tree to get some fixes thereof from Linux and then goes about fixing the CTRL_SLEEP_MOCI# handling we lately found to be problematic in certain cases (e.g. on the Yavia carrier board).

Andrejs Cainikovs (4):
configs: verdin-imx8mm: enable spl_gpio_hog
arm64: dts: verdin-imx8mm: add ctrl_sleep_moci# hog
configs: verdin-imx8mp: enable spl_gpio_hog
arm64: dts: verdin-imx8mp: add ctrl_sleep_moci# hog

Marcel Ziswiler (1):
verdin-imx8mm/verdin-imx8mp: synchronise device trees with linux

 arch/arm/dts/imx8mm-mx8menlo.dts              |  17 +-
 arch/arm/dts/imx8mm-verdin-dahlia.dtsi        | 150 ------------------
 arch/arm/dts/imx8mm-verdin-dev.dtsi           |  97 ++++++++++-
 .../dts/imx8mm-verdin-wifi-dev-u-boot.dtsi    |   8 +
 arch/arm/dts/imx8mm-verdin.dtsi               |  30 ++--
 arch/arm/dts/imx8mp-verdin-dahlia.dtsi        | 129 ---------------
 arch/arm/dts/imx8mp-verdin-dev.dtsi           | 125 ++++++++++++++-
 .../dts/imx8mp-verdin-wifi-dev-u-boot.dtsi    |   8 +
 arch/arm/dts/imx8mp-verdin-wifi.dtsi          |   5 +
 arch/arm/dts/imx8mp-verdin.dtsi               |  91 +++++++----
 board/toradex/verdin-imx8mm/MAINTAINERS       |   1 -
 board/toradex/verdin-imx8mp/MAINTAINERS       |   1 -
 configs/verdin-imx8mm_defconfig               |   1 +
 configs/verdin-imx8mp_defconfig               |   1 +
 14 files changed, 327 insertions(+), 337 deletions(-)
 delete mode 100644 arch/arm/dts/imx8mm-verdin-dahlia.dtsi
 delete mode 100644 arch/arm/dts/imx8mp-verdin-dahlia.dtsi
Signature · 1 line
2.36.1
#1 lore raw

PATCH 1/5 verdin-imx8mm/verdin-imx8mp: synchronise device trees with linux

From: Marcel Ziswiler <[email protected]>

Synchronise device trees with linux v6.5-rc1.

---

 arch/arm/dts/imx8mm-mx8menlo.dts        |  17 +--
 arch/arm/dts/imx8mm-verdin-dahlia.dtsi  | 150 ------------------------
 arch/arm/dts/imx8mm-verdin-dev.dtsi     |  97 ++++++++++++++-
 arch/arm/dts/imx8mm-verdin.dtsi         |  30 ++---
 arch/arm/dts/imx8mp-verdin-dahlia.dtsi  | 129 --------------------
 arch/arm/dts/imx8mp-verdin-dev.dtsi     | 125 +++++++++++++++++++-
 arch/arm/dts/imx8mp-verdin-wifi.dtsi    |   5 +
 arch/arm/dts/imx8mp-verdin.dtsi         |  91 +++++++++-----
 board/toradex/verdin-imx8mm/MAINTAINERS |   1 -
 board/toradex/verdin-imx8mp/MAINTAINERS |   1 -
 10 files changed, 309 insertions(+), 337 deletions(-)
 delete mode 100644 arch/arm/dts/imx8mm-verdin-dahlia.dtsi
 delete mode 100644 arch/arm/dts/imx8mp-verdin-dahlia.dtsi
arch/arm/dts/imx8mm-mx8menlo.dts +9 -8
index 32f6f2f50c1..0b123a84018 100644
@@ -10,6 +10,7 @@
 / {
 	model = "MENLO MX8MM EMBEDDED DEVICE";
 	compatible = "menlo,mx8menlo",
+		     "toradex,verdin-imx8mm-nonwifi",
 		     "toradex,verdin-imx8mm",
 		     "fsl,imx8mm";
 
@@ -250,21 +251,21 @@
 		/* SODIMM 96 */
 		MX8MM_IOMUXC_SAI1_RXD2_GPIO4_IO4			0x1c4
 		/* CPLD_D[7] */
-		MX8MM_IOMUXC_SAI1_RXD3_GPIO4_IO5			0x1c4
+		MX8MM_IOMUXC_SAI1_RXD3_GPIO4_IO5			0x184
 		/* CPLD_D[6] */
-		MX8MM_IOMUXC_SAI1_RXFS_GPIO4_IO0			0x1c4
+		MX8MM_IOMUXC_SAI1_RXFS_GPIO4_IO0			0x184
 		/* CPLD_D[5] */
-		MX8MM_IOMUXC_SAI1_TXC_GPIO4_IO11			0x1c4
+		MX8MM_IOMUXC_SAI1_TXC_GPIO4_IO11			0x184
 		/* CPLD_D[4] */
-		MX8MM_IOMUXC_SAI1_TXD0_GPIO4_IO12			0x1c4
+		MX8MM_IOMUXC_SAI1_TXD0_GPIO4_IO12			0x184
 		/* CPLD_D[3] */
-		MX8MM_IOMUXC_SAI1_TXD1_GPIO4_IO13			0x1c4
+		MX8MM_IOMUXC_SAI1_TXD1_GPIO4_IO13			0x184
 		/* CPLD_D[2] */
-		MX8MM_IOMUXC_SAI1_TXD2_GPIO4_IO14			0x1c4
+		MX8MM_IOMUXC_SAI1_TXD2_GPIO4_IO14			0x184
 		/* CPLD_D[1] */
-		MX8MM_IOMUXC_SAI1_TXD3_GPIO4_IO15			0x1c4
+		MX8MM_IOMUXC_SAI1_TXD3_GPIO4_IO15			0x184
 		/* CPLD_D[0] */
-		MX8MM_IOMUXC_SAI1_TXD4_GPIO4_IO16			0x1c4
+		MX8MM_IOMUXC_SAI1_TXD4_GPIO4_IO16			0x184
 		/* KBD_intK */
 		MX8MM_IOMUXC_SAI2_MCLK_GPIO4_IO27			0x1c4
 		/* DISP_reset */
arch/arm/dts/imx8mm-verdin-dahlia.dtsi deleted +0 -150

150 lines not on this page · raw message

arch/arm/dts/imx8mm-verdin-dev.dtsi +95 -2

136 lines not on this page · raw message

arch/arm/dts/imx8mm-verdin.dtsi +15 -15
index bcab830c6e9..6f081158714 100644
@@ -3,8 +3,8 @@
  * Copyright 2022 Toradex
  */
 
-#include "dt-bindings/phy/phy-imx8-pcie.h"
-#include "dt-bindings/pwm/pwm.h"
+#include <dt-bindings/phy/phy-imx8-pcie.h>
+#include <dt-bindings/pwm/pwm.h>
 #include "imx8mm.dtsi"
 
 / {
@@ -56,7 +56,11 @@
 	hdmi_connector: hdmi-connector {
 		compatible = "hdmi-connector";
 		ddc-i2c-bus = <&i2c2>;
+		/* Verdin PWM_3_DSI (SODIMM 19) */
+		hpd-gpios = <&gpio1 1 GPIO_ACTIVE_HIGH>;
 		label = "hdmi";
+		pinctrl-names = "default";
+		pinctrl-0 = <&pinctrl_pwm_3_dsi_hpd_gpio>;
 		type = "a";
 		status = "disabled";
 	};
@@ -95,9 +99,10 @@
 		compatible = "regulator-fixed";
 		enable-active-high;
 		gpio = <&gpio2 20 GPIO_ACTIVE_HIGH>; /* PMIC_EN_ETH */
-		off-on-delay = <500000>;
+		off-on-delay-us = <500000>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_reg_eth>;
+		regulator-always-on;
 		regulator-boot-on;
 		regulator-max-microvolt = <3300000>;
 		regulator-min-microvolt = <3300000>;
@@ -134,7 +139,7 @@
 		enable-active-high;
 		/* Verdin SD_1_PWR_EN (SODIMM 76) */
 		gpio = <&gpio3 5 GPIO_ACTIVE_HIGH>;
-		off-on-delay = <100000>;
+		off-on-delay-us = <100000>;
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_usdhc2_pwr_en>;
 		regulator-max-microvolt = <3300000>;
@@ -183,15 +188,15 @@
 	ddrc_opp_table: opp-table {
 		compatible = "operating-points-v2";
 
-		opp-25M {
+		opp-25000000 {
 			opp-hz = /bits/ 64 <25000000>;
 		};
 
-		opp-100M {
+		opp-100000000 {
 			opp-hz = /bits/ 64 <100000000>;
 		};
 
-		opp-750M {
+		opp-750000000 {
 			opp-hz = /bits/ 64 <750000000>;
 		};
 	};
@@ -358,7 +363,6 @@
 		pinctrl-names = "default";
 		pinctrl-0 = <&pinctrl_pmic>;
 		reg = <0x25>;
-		sd-vsel-gpios = <&gpio1 4 GPIO_ACTIVE_HIGH>;
 
 		/*
 		 * The bootloader is expected to switch on the I2C level shifter for the TLA2024 ADC
@@ -598,7 +602,7 @@
 	hdmi_lontium_lt8912: hdmi@48 {
 		compatible = "lontium,lt8912b";
 		pinctrl-names = "default";
-		pinctrl-0 = <&pinctrl_gpio_10_dsi>, <&pinctrl_pwm_3_dsi_hpd_gpio>;
+		pinctrl-0 = <&pinctrl_gpio_10_dsi>;
 		reg = <0x48>;
 		/* Verdin GPIO_9_DSI (LT8912 INT, SODIMM 17, unused) */
 		/* Verdin GPIO_10_DSI (SODIMM 21) */
@@ -610,7 +614,7 @@
 		compatible = "atmel,maxtouch";
 		/*
 		 * Verdin GPIO_9_DSI
-		 * (TOUCH_INT#, SODIMM 17, also routed to SN65DSI83 IRQ albeit currently unused)
+		 * (TOUCH_INT#, SODIMM 17, also routed to SN65DSI84 IRQ albeit currently unused)
 		 */
 		interrupt-parent = <&gpio3>;
 		interrupts = <15 IRQ_TYPE_EDGE_FALLING>;
@@ -653,9 +657,6 @@
 	assigned-clock-parents = <&clk IMX8MM_SYS_PLL2_50M>,
 				 <&clk IMX8MM_SYS_PLL2_250M>;
 	assigned-clock-rates = <10000000>, <250000000>;
-	clocks = <&clk IMX8MM_CLK_PCIE1_ROOT>, <&clk IMX8MM_CLK_PCIE1_AUX>,
-		 <&clk IMX8MM_CLK_PCIE1_PHY>;
-	clock-names = "pcie", "pcie_aux", "pcie_bus";
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_pcie0>;
 	/* PCIE_1_RESET# (SODIMM 244) */
@@ -664,6 +665,7 @@
 
 &pcie_phy {
 	clocks = <&clk IMX8MM_CLK_PCIE1_PHY>;
+	clock-names = "ref";
 	fsl,clkreq-unsupported;
 	fsl,refclk-pad-mode = <IMX8_PCIE_REFCLK_PAD_OUTPUT>;
 	fsl,tx-deemph-gen1 = <0x2d>;
@@ -739,7 +741,6 @@
 	adp-disable;
 	dr_mode = "otg";
 	hnp-disable;
-	over-current-active-low;
 	samsung,picophy-dc-vol-level-adjust = <7>;
 	samsung,picophy-pre-emp-curr-control = <3>;
 	srp-disable;
@@ -749,7 +750,6 @@
 /* Verdin USB_2 */
 &usbotg2 {
 	dr_mode = "host";
-	over-current-active-low;
 	samsung,picophy-dc-vol-level-adjust = <7>;
 	samsung,picophy-pre-emp-curr-control = <3>;
 	vbus-supply = <&reg_usb_otg2_vbus>;
arch/arm/dts/imx8mp-verdin-dahlia.dtsi deleted +0 -129

129 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin-dev.dtsi +122 -3

162 lines not on this page · raw message

arch/arm/dts/imx8mp-verdin-wifi.dtsi +5 -0
index 36289c175e6..ef94f9a57e2 100644
@@ -65,6 +65,11 @@
 	pinctrl-names = "default";
 	pinctrl-0 = <&pinctrl_bt_uart>;
 	status = "okay";
+
+	bluetooth {
+		compatible = "mrvl,88w8997";
+		max-speed = <921600>;
+	};
 };
 
 /* On-module Wi-Fi */
arch/arm/dts/imx8mp-verdin.dtsi +63 -28

193 lines not on this page · raw message

board/toradex/verdin-imx8mm/MAINTAINERS +0 -1
index 974b3a10329..b0f4329253a 100644
@@ -3,7 +3,6 @@ M:	Marcel Ziswiler <[email protected]>
 W:	https://www.toradex.com/computer-on-modules/verdin-arm-family/nxp-imx-8m-mini
 S:	Maintained
 F:	arch/arm/dts/imx8mm-verdin.dtsi
-F:	arch/arm/dts/imx8mm-verdin-dahlia.dtsi
 F:	arch/arm/dts/imx8mm-verdin-dev.dtsi
 F:	arch/arm/dts/imx8mm-verdin-wifi.dtsi
 F:	arch/arm/dts/imx8mm-verdin-wifi-dev.dts
board/toradex/verdin-imx8mp/MAINTAINERS +0 -1
index cff3c503838..ea04a83926a 100644
@@ -1,6 +1,5 @@
 Verdin iMX8M Plus
 F:	arch/arm/dts/imx8mp-verdin.dtsi
-F:	arch/arm/dts/imx8mp-verdin-dahlia.dtsi
 F:	arch/arm/dts/imx8mp-verdin-dev.dtsi
 F:	arch/arm/dts/imx8mp-verdin-wifi.dtsi
 F:	arch/arm/dts/imx8mp-verdin-wifi-dev.dts
Signature · 1 line
2.36.1
#2 lore raw

PATCH 1/5 verdin-imx8mm/verdin-imx8mp: synchronise device trees with linux

Quoted 3 lines

From: Marcel Ziswiler <[email protected]> Synchronise device trees with linux v6.5-rc1.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#3 lore raw

PATCH 2/5 configs: verdin-imx8mm: enable spl_gpio_hog

In reply to Marcel Ziswiler

From: Andrejs Cainikovs <[email protected]>

Enable CONFIG_SPL_GPIO_HOG option to be able to control GPIO hogs from SPL.

---

 configs/verdin-imx8mm_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/verdin-imx8mm_defconfig +1 -0
index 0eb18915154..09e14c6f8c4 100644
@@ -98,6 +98,7 @@ CONFIG_CLK_COMPOSITE_CCF=y
 CONFIG_SPL_CLK_IMX8MM=y
 CONFIG_CLK_IMX8MM=y
 CONFIG_GPIO_HOG=y
+CONFIG_SPL_GPIO_HOG=y
 CONFIG_MXC_GPIO=y
 CONFIG_DM_I2C=y
 CONFIG_MISC=y
Signature · 1 line
2.36.1
#4 lore raw

PATCH 2/5 configs: verdin-imx8mm: enable spl_gpio_hog

Quoted 5 lines

From: Andrejs Cainikovs <[email protected]> Enable CONFIG_SPL_GPIO_HOG option to be able to control GPIO hogs from SPL.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#5 lore raw

PATCH 3/5 arm64: dts: verdin-imx8mm: add ctrl_sleep_moci# hog

In reply to Marcel Ziswiler

From: Andrejs Cainikovs <[email protected]>

Drive CTRL_SLEEP_MOCI# high at boot (SPL) using a GPIO hog, this signal may be used to control some power-rails on the carrier board, therefore it should be set to high when the module is booting.

To do this as early as possible is generally a good idea and the issue was noticed on the Yavia carrier board where it is needed to power the I2C EEPROM on the carrier board.

---

 arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/dts/imx8mm-verdin-wifi-dev-u-boot.dtsi +8 -0
index 494229e4e62..2b268f55cb9 100644
@@ -56,6 +56,10 @@
 
 &gpio5 {
 	bootph-pre-ram;
+
+	ctrl-sleep-moci-hog {
+		bootph-pre-ram;
+	};
 };
 
 &i2c1 {
@@ -88,6 +92,10 @@
 	};
 };
 
+&pinctrl_ctrl_sleep_moci {
+	bootph-pre-ram;
+};
+
 &pinctrl_i2c1 {
 	bootph-pre-ram;
 };
Signature · 1 line
2.36.1
#6 lore raw

PATCH 3/5 arm64: dts: verdin-imx8mm: add ctrl_sleep_moci# hog

Quoted 9 lines

From: Andrejs Cainikovs <[email protected]> Drive CTRL_SLEEP_MOCI# high at boot (SPL) using a GPIO hog, this signal may be used to control some power-rails on the carrier board, therefore it should be set to high when the module is booting.
To do this as early as possible is generally a good idea and the issue was noticed on the Yavia carrier board where it is needed to power the I2C EEPROM on the carrier board.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#7 lore raw

PATCH 4/5 configs: verdin-imx8mp: enable spl_gpio_hog

In reply to Marcel Ziswiler

From: Andrejs Cainikovs <[email protected]>

Enable CONFIG_SPL_GPIO_HOG option to be able to control GPIO hogs from SPL.

---

 configs/verdin-imx8mp_defconfig | 1 +
 1 file changed, 1 insertion(+)
configs/verdin-imx8mp_defconfig +1 -0
index f1fa2b8f496..37ab9e44140 100644
@@ -108,6 +108,7 @@ CONFIG_CLK_COMPOSITE_CCF=y
 CONFIG_CLK_IMX8MP=y
 CONFIG_FSL_CAAM=y
 CONFIG_GPIO_HOG=y
+CONFIG_SPL_GPIO_HOG=y
 CONFIG_MXC_GPIO=y
 CONFIG_DM_PCA953X=y
 CONFIG_DM_I2C=y
Signature · 1 line
2.36.1
#8 lore raw

PATCH 4/5 configs: verdin-imx8mp: enable spl_gpio_hog

Quoted 5 lines

From: Andrejs Cainikovs <[email protected]> Enable CONFIG_SPL_GPIO_HOG option to be able to control GPIO hogs from SPL.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================
#9 lore raw

PATCH 5/5 arm64: dts: verdin-imx8mp: add ctrl_sleep_moci# hog

In reply to Marcel Ziswiler

From: Andrejs Cainikovs <[email protected]>

Drive CTRL_SLEEP_MOCI# high at boot (SPL) using a GPIO hog, this signal may be used to control some power-rails on the carrier board, therefore it should be set to high when the module is booting.

To do this as early as possible is generally a good idea and the issue was noticed on the Yavia carrier board where it is needed to power the I2C EEPROM on the carrier board.

---

 arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi | 8 ++++++++
 1 file changed, 8 insertions(+)
arch/arm/dts/imx8mp-verdin-wifi-dev-u-boot.dtsi +8 -0
index 9c6c417f7ee..0162f9b2da3 100644
@@ -62,6 +62,10 @@
 
 &gpio4 {
 	bootph-pre-ram;
+
+	ctrl-sleep-moci-hog {
+		bootph-pre-ram;
+	};
 };
 
 &gpio5 {
@@ -106,6 +110,10 @@
 	bootph-pre-ram;
 };
 
+&pinctrl_ctrl_sleep_moci {
+	bootph-pre-ram;
+};
+
 &pinctrl_i2c1 {
 	bootph-pre-ram;
 };
Signature · 1 line
2.36.1
#10 lore raw

PATCH 5/5 arm64: dts: verdin-imx8mp: add ctrl_sleep_moci# hog

Quoted 9 lines

From: Andrejs Cainikovs <[email protected]> Drive CTRL_SLEEP_MOCI# high at boot (SPL) using a GPIO hog, this signal may be used to control some power-rails on the carrier board, therefore it should be set to high when the module is booting.
To do this as early as possible is generally a good idea and the issue was noticed on the Yavia carrier board where it is needed to power the I2C EEPROM on the carrier board.

Applied to u-boot-imx, master, thanks !

Best regards,
Stefano Babic

Signature · 5 lines
=====================================================================
DENX Software Engineering GmbH,        Managing Director: Erika Unter  
HRB 165235 Munich,   Office: Kirchenstr.5, 82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: [email protected]
=====================================================================