Skip to contentSkip to conversation

ARM: dts: bugfix tqma7 soft reset issue

PATCH Superseded Bruno Thomsen 3 participants 5 messages Apr 14, 2019 – Apr 22, 2019

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

PATCH 1/1 ARM: dts: bugfix tqma7 soft reset issue

Running reboot command on the TQMa7 board would just hang infinite at the end of the system shutdown process.

Handling of i.MX7 errata e10574:
Watchdog: A watchdog timeout or software trigger will not reset the SOC.

---
 arch/arm/boot/dts/imx7-tqma7.dtsi | 7 +++++++
 1 file changed, 7 insertions(+)
arch/arm/boot/dts/imx7-tqma7.dtsi +7 -0
index 85fe461e5e67..896eff839d5e 100644
@@ -228,5 +228,12 @@
 };
 
 &wdog1 {
+	/*
+	 * Errata e10574:
+	 * WDOG reset needs to run with WDOG_RESET_B signal enabled.
+	 * X1-51 (WDOG1#) signal needs carrier board handling to reset
+	 * TQMa7 on X1-22 (RESET_IN#).
+	 */
+	fsl,ext-reset-output;
 	status = "okay";
 };
Signature · 1 line
2.20.1
reviewer
#1 lore raw

Hi Bruno,

arch/arm/boot/dts/imx7-tqma7.dtsi line 238

Quoted 9 lines · Bruno Thomsen

&wdog1 {

arch/arm/boot/dts/imx7-tqma7.dtsi +7 -0
+       /*
+        * Errata e10574:
+        * WDOG reset needs to run with WDOG_RESET_B signal enabled.
+        * X1-51 (WDOG1#) signal needs carrier board handling to reset
+        * TQMa7 on X1-22 (RESET_IN#).
+        */
+       fsl,ext-reset-output;
        status = "okay";

You should also add a pinctrl entry for the watchdog pin.

Please check arch/arm/boot/dts/imx7s-warp.dts for an example.

#2 lore raw

Hi Fabio,

Den søn. 14. apr. 2019 kl. 17.32 skrev Fabio Estevam <[email protected]>:

Quoted 11 lines

arch/arm/boot/dts/imx7-tqma7.dtsi line 238

Quoted 9 lines

&wdog1 {

arch/arm/boot/dts/imx7-tqma7.dtsi +7 -0
+       /*
+        * Errata e10574:
+        * WDOG reset needs to run with WDOG_RESET_B signal enabled.
+        * X1-51 (WDOG1#) signal needs carrier board handling to reset
+        * TQMa7 on X1-22 (RESET_IN#).
+        */
+       fsl,ext-reset-output;
        status = "okay";

You should also add a pinctrl entry for the watchdog pin.

There is a pinctrl entry for the watchdog pin in imx7-mba7.dtsi file almost identically to imx7s-warp.dts. There are technical 2 pins you can use for the output, and this dtsi will be used for other product device trees as well. Where the imx7-mba7.dtsi will only be used for the development board.
I agree with you that the readability of this dtsi will improve, and the next device tree I want to mainline also use this pin configuration.

Bruno

_______________________________________________
linux-arm-kernel mailing list
[email protected]
http://lists.infradead.org/mailman/listinfo/linux-arm-kernel

#3 lore raw

PATCH v2 1/1 ARM: dts: bugfix tqma7 soft reset issue

In reply to Bruno Thomsen

Running reboot command on the TQMa7 board would just hang infinite at the end of the system shutdown process.

Handling of i.MX7 errata e10574:
Watchdog: A watchdog timeout or software trigger will not reset the SOC.

Moved pinctrl from common mba7 to common tqma7 dtsi as it improves readability of errata handling. Most integrators of this SoM will likely use the development board as inspiration for handling this SoC issue.

---
v2:
Moved pinctrl from common development board to common SoM. Removed Markus reviewed-by as he only acked the fsl,ext-reset-output part.

 arch/arm/boot/dts/imx7-mba7.dtsi  | 11 -----------
 arch/arm/boot/dts/imx7-tqma7.dtsi | 17 +++++++++++++++++
 2 files changed, 17 insertions(+), 11 deletions(-)
arch/arm/boot/dts/imx7-mba7.dtsi +0 -11
index 578341b6848b..50abf18ad30b 100644
@@ -472,12 +472,6 @@
 			MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5	0x59
 		>;
 	};
-
-	pinctrl_wdog1: wdog1grp {
-		fsl,pins = <
-			MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B	0x30
-		>;
-	};
 };
 
 &pwm1 {
@@ -554,8 +548,3 @@
 	no-1-8-v;
 	status = "okay";
 };
-
-&wdog1 {
-	pinctrl-names = "default";
-	pinctrl-0 = <&pinctrl_wdog1>;
-};
arch/arm/boot/dts/imx7-tqma7.dtsi +17 -0
index 85fe461e5e67..9aaed85138cb 100644
@@ -209,6 +209,14 @@
 	};
 };
 
+&iomuxc_lpsr {
+	pinctrl_wdog1: wdog1grp {
+		fsl,pins = <
+			MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B	0x30
+		>;
+	};
+};
+
 &sdma {
 	status = "okay";
 };
@@ -228,5 +236,14 @@
 };
 
 &wdog1 {
+	pinctrl-names = "default";
+	pinctrl-0 = <&pinctrl_wdog1>;
+	/*
+	 * Errata e10574:
+	 * WDOG reset needs to run with WDOG_RESET_B signal enabled.
+	 * X1-51 (WDOG1#) signal needs carrier board handling to reset
+	 * TQMa7 on X1-22 (RESET_IN#).
+	 */
+	fsl,ext-reset-output;
 	status = "okay";
 };
Signature · 1 line
2.20.1
Applied
#4 lore raw
Quoted 6 lines · Bruno Thomsen

Running reboot command on the TQMa7 board would just hang infinite at the end of the system shutdown process.

Handling of i.MX7 errata e10574:
Watchdog: A watchdog timeout or software trigger will not reset the SOC.

Quoted 6 lines

Moved pinctrl from common mba7 to common tqma7 dtsi as it improves readability of errata handling. Most integrators of this SoM will likely use the development board as inspiration for handling this SoC issue.

Applied, thanks.