From: Alexander Shiyan Date: Fri, 13 Jun 2014 07:26:13 +0000 (+0400) Subject: ARM: i.MX system: Add a reset fallback if base address of watchdog is not set X-Git-Tag: v3.17-rc1~79^2~22^2~35 X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=5a6e1502ebb11770bcd76de7b00baff6cf467fc1;p=karo-tx-linux.git ARM: i.MX system: Add a reset fallback if base address of watchdog is not set This patch adds a reset fallback if base address of watchdog is not set. This is intended for a targets not compatible with imx-21 watchdog, i.MX1 for example. Signed-off-by: Alexander Shiyan Signed-off-by: Shawn Guo --- diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c index 92d11c271222..d14c33fd6b03 100644 --- a/arch/arm/mach-imx/system.c +++ b/arch/arm/mach-imx/system.c @@ -42,6 +42,9 @@ void mxc_restart(enum reboot_mode mode, const char *cmd) { unsigned int wcr_enable; + if (!wdog_base) + goto reset_fallback; + if (!IS_ERR(wdog_clk)) clk_enable(wdog_clk); @@ -70,6 +73,7 @@ void mxc_restart(enum reboot_mode mode, const char *cmd) /* delay to allow the serial port to show the message */ mdelay(50); +reset_fallback: /* we'll take a jump through zero as a poor second */ soft_restart(0); }