diff options
| author | Bruno Thomsen <bruno.thomsen@gmail.com> | 2019-04-16 11:08:05 +0200 |
|---|---|---|
| committer | Shawn Guo <shawnguo@kernel.org> | 2019-04-22 08:51:49 +0800 |
| commit | 5ea0c200bd30a96732fb50a5d7428d0d75b39d28 (patch) | |
| tree | 223ca893551a1442a68308d4ee4b466e91e732cd /arch | |
| parent | 716be61d186939eebacdbccfc14e9ea3bd70f8c6 (diff) | |
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.
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.
Signed-off-by: Bruno Thomsen <bruno.thomsen@gmail.com>
Signed-off-by: Shawn Guo <shawnguo@kernel.org>
Diffstat (limited to 'arch')
| -rw-r--r-- | arch/arm/boot/dts/imx7-mba7.dtsi | 11 | ||||
| -rw-r--r-- | arch/arm/boot/dts/imx7-tqma7.dtsi | 17 |
2 files changed, 17 insertions, 11 deletions
diff --git a/arch/arm/boot/dts/imx7-mba7.dtsi b/arch/arm/boot/dts/imx7-mba7.dtsi index 578341b6848b..50abf18ad30b 100644 --- a/arch/arm/boot/dts/imx7-mba7.dtsi +++ b/arch/arm/boot/dts/imx7-mba7.dtsi @@ -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>; -}; diff --git a/arch/arm/boot/dts/imx7-tqma7.dtsi b/arch/arm/boot/dts/imx7-tqma7.dtsi index 85fe461e5e67..9aaed85138cb 100644 --- a/arch/arm/boot/dts/imx7-tqma7.dtsi +++ b/arch/arm/boot/dts/imx7-tqma7.dtsi @@ -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"; }; |