diff mbox

[U-Boot,v2] common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()

Message ID 1425971076-6089-1-git-send-email-sr@denx.de
State Awaiting Upstream
Delegated to: Stefano Babic
Headers show

Commit Message

Stefan Roese March 10, 2015, 7:04 a.m. UTC 
Without this patch, the IMX watchdog will not be initialized. And therefor
not active. This patch fixes this by calling hw_watchdog_init() also when
CONFIG_IMX_WATCHDOG is defined.

Signed-off-by: Stefan Roese <sr@denx.de>
Cc: Simon Glass <sjg@chromium.org>
Cc: Fabio Estevam <fabio.estevam@freescale.com> 
Cc: Stefano Babic <sbabic@denx.de>
Cc: Heiko Schocher <hs@denx.de>
---
v2:
- Move closing parenthesis to include all "||" parts

 common/board_f.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

Comments

Heiko Schocher March 12, 2015, 7:56 a.m. UTC | #1 
Hello Stefan,

Am 10.03.2015 08:04, schrieb Stefan Roese:
> Without this patch, the IMX watchdog will not be initialized. And therefor
> not active. This patch fixes this by calling hw_watchdog_init() also when
> CONFIG_IMX_WATCHDOG is defined.
>
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Fabio Estevam <fabio.estevam@freescale.com>
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> ---
> v2:
> - Move closing parenthesis to include all "||" parts
>
>   common/board_f.c | 3 ++-
>   1 file changed, 2 insertions(+), 1 deletion(-)

Thanks!

Acked-by: Heiko Schocher <hs@denx.de>

bye,
Heiko
Stefano Babic March 13, 2015, 12:33 p.m. UTC | #2 
On 10/03/2015 08:04, Stefan Roese wrote:
> Without this patch, the IMX watchdog will not be initialized. And therefor
> not active. This patch fixes this by calling hw_watchdog_init() also when
> CONFIG_IMX_WATCHDOG is defined.
> 
> Signed-off-by: Stefan Roese <sr@denx.de>
> Cc: Simon Glass <sjg@chromium.org>
> Cc: Fabio Estevam <fabio.estevam@freescale.com> 
> Cc: Stefano Babic <sbabic@denx.de>
> Cc: Heiko Schocher <hs@denx.de>
> ---


Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic
diff mbox

Patch

diff --git a/common/board_f.c b/common/board_f.c
index 4d8b8a6..89ce795 100644
--- a/common/board_f.c
+++ b/common/board_f.c
@@ -111,7 +111,8 @@  static int init_func_watchdog_init(void)
 {
 # if defined(CONFIG_HW_WATCHDOG) && (defined(CONFIG_BLACKFIN) || \
 	defined(CONFIG_M68K) || defined(CONFIG_MICROBLAZE) || \
-	defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG))
+	defined(CONFIG_SH) || defined(CONFIG_AT91SAM9_WATCHDOG) || \
+	defined(CONFIG_IMX_WATCHDOG))
 	hw_watchdog_init();
 # endif
 	puts("       Watchdog enabled\n");