diff options
| author | Marek Vasut <[email protected]> | 2020-04-29 15:04:26 +0200 |
|---|---|---|
| committer | Stefano Babic <[email protected]> | 2020-05-01 13:46:22 +0200 |
| commit | f24dea4e1b52241ea048cee49e95af630e5a96f0 (patch) | |
| tree | e59693c2f39ecf78b44da53a6836c435b2466500 | |
| parent | 2455f91833efbfa524cd9753ac32bd495a3fc8de (diff) | |
ARM: imx8m: Fix reset in SPL on NXP iMX8MP EVK
Board files should not re-implement do_reset() to work around this
function not being defined in for specific configurations. Rather,
the fix is to compile in drivers which implement this properly.
This patch enables sysreset and watchdog drivers in SPL and ties
them together to implement the same as the do_reset() hack in the
board file, except correctly in the DM/DT framework.
Signed-off-by: Marek Vasut <[email protected]>
Cc: Fabio Estevam <[email protected]>
Cc: Flavio Suligoi <[email protected]>
Cc: Harald Seiler <[email protected]>
Cc: Igor Opaniuk <[email protected]>
Cc: Marcel Ziswiler <[email protected]>
Cc: Oleksandr Suvorov <[email protected]>
Cc: Peng Fan <[email protected]>
Cc: Stefano Babic <[email protected]>
| -rw-r--r-- | arch/arm/dts/imx8mp-evk-u-boot.dtsi | 12 | ||||
| -rw-r--r-- | configs/imx8mp_evk_defconfig | 4 |
2 files changed, 16 insertions, 0 deletions
diff --git a/arch/arm/dts/imx8mp-evk-u-boot.dtsi b/arch/arm/dts/imx8mp-evk-u-boot.dtsi index 4675ada0a0a..24a93ac2d69 100644 --- a/arch/arm/dts/imx8mp-evk-u-boot.dtsi +++ b/arch/arm/dts/imx8mp-evk-u-boot.dtsi @@ -3,6 +3,14 @@ * Copyright 2019 NXP */ +/ { + wdt-reboot { + compatible = "wdt-reboot"; + wdt = <&wdog1>; + u-boot,dm-spl; + }; +}; + &{/soc@0} { u-boot,dm-pre-reloc; u-boot,dm-spl; @@ -119,3 +127,7 @@ &usdhc3 { u-boot,dm-spl; }; + +&wdog1 { + u-boot,dm-spl; +}; diff --git a/configs/imx8mp_evk_defconfig b/configs/imx8mp_evk_defconfig index 3086b7b6d7a..44b2935f699 100644 --- a/configs/imx8mp_evk_defconfig +++ b/configs/imx8mp_evk_defconfig @@ -79,4 +79,8 @@ CONFIG_DM_REGULATOR_FIXED=y CONFIG_DM_REGULATOR_GPIO=y CONFIG_MXC_UART=y CONFIG_SYSRESET=y +CONFIG_SPL_SYSRESET=y CONFIG_SYSRESET_PSCI=y +CONFIG_SYSRESET_WATCHDOG=y +# CONFIG_WATCHDOG is not set +CONFIG_IMX_WATCHDOG=y |