From: Claudius Heine Date: Wed, 4 Mar 2020 14:23:12 +0000 (+0100) Subject: imx: imx8m: Don't use the addr parameter of reset_cpu X-Git-Tag: v2020.07-rc2~15^2~33 X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=3675d93875df54532681450140a536d93b30de95;p=oweals%2Fu-boot.git imx: 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-Authored-by: Harald Seiler Signed-off-by: Claudius Heine Signed-off-by: Harald Seiler Reviewed-by: Marek Vasut --- diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index f10b71c345..c97c8033c8 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -410,10 +410,7 @@ int ft_system_setup(void *blob, bd_t *bd) #if defined(CONFIG_SPL_BUILD) || !defined(CONFIG_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);