common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()

PATCH New Stefan Roese 3 participants 3 messages Mar 10, 2015 – Mar 13, 2015

Share & tools

Stefan Roese

author

2015-03-10 07:04 UTC #0 lore raw

PATCH v2 1/1 common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()

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 <[email protected]>

Cc Simon Glass <[email protected]>

Cc Fabio Estevam <[email protected]>

Cc Stefano Babic <[email protected]>

Cc Heiko Schocher <[email protected]>

---
v2:
- Move closing parenthesis to include all "||" parts

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

common/board_f.c +2 -1

index 4d8b8a6..89ce795 100644
@@ -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");

Signature · 1 line

2.3.2

Heiko Schocher

2015-03-12 07:56 UTC #1 lore raw

PATCH v2 1/1 common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()

Hello Stefan,

Am 10.03.2015 08:04, schrieb Stefan Roese:

Quoted 9 lines

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 <[email protected]>
Cc Simon Glass <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Heiko Schocher <[email protected]>

Quoted 6 lines

---
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 <[email protected]>

bye,
Heiko

Signature · 2 lines

DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany

Stefano Babic

2015-03-13 12:33 UTC #2 lore raw

PATCH v2 1/1 common/board_f.c: Enable IMX watchdog in init_func_watchdog_init()

In reply to Stefan Roese

Quoted 10 lines · 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 <[email protected]>
Cc Simon Glass <[email protected]>
Cc Fabio Estevam <[email protected]>
Cc Stefano Babic <[email protected]>
Cc Heiko Schocher <[email protected]>
---

Applied to u-boot-imx, thanks !

Best regards,
Stefano Babic

Signature · 5 lines

=====================================================================
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: +49-8142-66989-53 Fax: +49-8142-66989-80 Email: sbabic at denx.de
=====================================================================