dany/u-boot-megous
1
0
Fork 0
mirror of https://xff.cz/git/u-boot/ synced 2025-09-04 10:12:14 +02:00
Code Issues Packages Projects Releases Wiki Activity

ARM: imx8m: Don't use the addr parameter of reset_cpu()

Browse Source 
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: d2041725e8 ("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>
This commit is contained in:
Claudius Heine
2020-04-29 15:04:23 +02:00
committed by Stefano Babic
parent 568af92679
commit c5635a032a
1 changed files with 1 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

5
arch/arm/mach-imx/imx8m/soc.c
View File

@@ -412,10 +412,7 @@ int ft_system_setup(void *blob, bd_t *bd)
#if !CONFIG_IS_ENABLED(SYSRESET) #if !CONFIG_IS_ENABLED(SYSRESET)
void reset_cpu(ulong addr) void reset_cpu(ulong addr)
{ {
struct watchdog_regs *wdog = (struct watchdog_regs *)addr; struct watchdog_regs *wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
if (!addr)
wdog = (struct watchdog_regs *)WDOG1_BASE_ADDR;
/* Clear WDA to trigger WDOG_B immediately */ /* Clear WDA to trigger WDOG_B immediately */
writew((SET_WCR_WT(1) | WCR_WDT | WCR_WDE | WCR_SRS), &wdog->wcr); writew((SET_WCR_WT(1) | WCR_WDT | WCR_WDE | WCR_SRS), &wdog->wcr);