Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

authored by

Bruno Thomsen and committed by
Shawn Guo
5ea0c200 716be61d

+17 -11
-11
arch/arm/boot/dts/imx7-mba7.dtsi
··· 472 472 MX7D_PAD_LPSR_GPIO1_IO05__GPIO1_IO5 0x59 473 473 >; 474 474 }; 475 - 476 - pinctrl_wdog1: wdog1grp { 477 - fsl,pins = < 478 - MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x30 479 - >; 480 - }; 481 475 }; 482 476 483 477 &pwm1 { ··· 547 553 bus-width = <4>; 548 554 no-1-8-v; 549 555 status = "okay"; 550 - }; 551 - 552 - &wdog1 { 553 - pinctrl-names = "default"; 554 - pinctrl-0 = <&pinctrl_wdog1>; 555 556 };
+17
arch/arm/boot/dts/imx7-tqma7.dtsi
··· 209 209 }; 210 210 }; 211 211 212 + &iomuxc_lpsr { 213 + pinctrl_wdog1: wdog1grp { 214 + fsl,pins = < 215 + MX7D_PAD_LPSR_GPIO1_IO00__WDOG1_WDOG_B 0x30 216 + >; 217 + }; 218 + }; 219 + 212 220 &sdma { 213 221 status = "okay"; 214 222 }; ··· 236 228 }; 237 229 238 230 &wdog1 { 231 + pinctrl-names = "default"; 232 + pinctrl-0 = <&pinctrl_wdog1>; 233 + /* 234 + * Errata e10574: 235 + * WDOG reset needs to run with WDOG_RESET_B signal enabled. 236 + * X1-51 (WDOG1#) signal needs carrier board handling to reset 237 + * TQMa7 on X1-22 (RESET_IN#). 238 + */ 239 + fsl,ext-reset-output; 239 240 status = "okay"; 240 241 };