Hello Marek,
On Wed, 2020-03-04 at 15:30 +0100, Marek Vasut wrote:
On 3/4/20 3:23 PM, Harald Seiler wrote:
From: Claudius Heine ch@denx.de
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 hws@denx.de Signed-off-by: Claudius Heine ch@denx.de Signed-off-by: Harald Seiler hws@denx.de
arch/arm/mach-imx/imx8m/soc.c | 5 +---- 1 file changed, 1 insertion(+), 4 deletions(-)
diff --git a/arch/arm/mach-imx/imx8m/soc.c b/arch/arm/mach-imx/imx8m/soc.c index 7fcbd53f3020..2d3afc61a452 100644 --- a/arch/arm/mach-imx/imx8m/soc.c +++ b/arch/arm/mach-imx/imx8m/soc.c @@ -385,10 +385,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((WCR_WDE | WCR_SRS), &wdog->wcr);Can't we remove the param altogether ?
Yes, that is what I would suggest as well. Although I'd do that as a separate follow up because it is not ARM nor i.MX specific.
Otherwise Reviewed-by: Marek Vasut marex@denx.de