diff options
| author | Claudius Heine <ch@denx.de> | 2020-04-29 15:04:23 +0200 |
|---|---|---|
| committer | Stefano Babic <sbabic@denx.de> | 2020-05-01 13:46:22 +0200 |
| commit | c5635a032a4bc63148c3ecd09c4cc49632b4fa4a (patch) | |
| tree | ef016ad88abf091c606c98cae164c79c2fa02a03 | |
| parent | 568af926792b1862028a8f1d3599b12b1e150bbf (diff) | |
| download | u-boot-c5635a032a4bc63148c3ecd09c4cc49632b4fa4a.tar.gz | |
ARM: imx8m: Don't use the addr parameter of reset_cpu()
imx8m has the only implementation of reset_cpu() which does not ignore
the addr parameter and instead gives it some meaning as the base address
of watchdog registers. This breaks convention with the rest of U-Boot
where the parameter is ignored and callers are passing in 0.
Fixes: d2041725e84b ("imx8m: restrict reset_cpu")
Co-developed-by: Harald Seiler <hws@denx.de>
Signed-off-by: Harald Seiler <hws@denx.de>
Signed-off-by: Claudius Heine <ch@denx.de>
| -rw-r--r-- | arch/arm/mach-imx/imx8m/soc.c | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index f0a0e1bbf8..89229da3b6 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -412,10 +412,7 @@ int ft_system_setup(void *blob, bd_t *bd) #if !CONFIG_IS_ENABLED(SYSRESET) void reset_cpu(ulong addr) { - struct watchdog_regs *wdog = (struct watchdog_regs *)addr; - - if (!addr) - wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; + struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR; /* Clear WDA to trigger WDOG_B immediately */ writew((SET_WCR_WT(1) | WCR_WDT | WCR_WDE | WCR_SRS), &wdog->wcr); |