Skip to contentSkip to conversation

drivers: watchdog: wdt-uclass: Use IS_ENABLED for WATCHDOG_AUTOSTART

PATCH In review Teresa Remmet 2 participants 2 messages Jul 15, 2021 – Jul 16, 2021 Watchdog device drivers

lore
Share & tools
lore
#0 lore raw

PATCH v2 1/1 drivers: watchdog: wdt-uclass: Use IS_ENABLED for WATCHDOG_AUTOSTART

There is no separate SPL/TPL config for WATCHDOG_AUTOSTART. So use IS_ENABLED instead of CONFIG_IS_ENABLED to make watchdog working in SPL again.

Fixes 830d29ac3721 ("watchdog: Allow to use CONFIG_WDT without starting watchdog")

---
Changes in v2:
- Added Fixes tag
- Added Reviewed-by

 drivers/watchdog/wdt-uclass.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/wdt-uclass.c +1 -1
index a0c2429e5a43..17334dbda6c9 100644
@@ -53,7 +53,7 @@ int initr_watchdog(void)
 						    4 * reset_period) / 4;
 	}
 
-	if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) {
+	if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) {
 		printf("WDT:   Not starting\n");
 		return 0;
 	}
Signature · 1 line
2.25.1
#1 lore raw
Quoted 7 lines · Teresa Remmet

There is no separate SPL/TPL config for WATCHDOG_AUTOSTART. So use IS_ENABLED instead of CONFIG_IS_ENABLED to make watchdog working in SPL again.

Fixes 830d29ac3721 ("watchdog: Allow to use CONFIG_WDT without starting watchdog")

Applied to u-boot-marvell/master

Thanks,
Stefan

Quoted 14 lines

---
Changes in v2:
- Added Fixes tag
- Added Reviewed-by

  drivers/watchdog/wdt-uclass.c | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/wdt-uclass.c +0 -0
index a0c2429e5a43..17334dbda6c9 100644

drivers/watchdog/wdt-uclass.c int initr_watchdog(void) · line 59

Quoted 8 lines
drivers/watchdog/wdt-uclass.c +1 -1
@@ -53,7 +53,7 @@ int initr_watchdog(void)
  						    4 * reset_period) / 4;
  	}
 
-	if (!CONFIG_IS_ENABLED(WATCHDOG_AUTOSTART)) {
+	if (!IS_ENABLED(CONFIG_WATCHDOG_AUTOSTART)) {
  		printf("WDT:   Not starting\n");
  		return 0;
  	}

Viele Grüße,
Stefan

Signature · 3 lines
DENX Software Engineering GmbH,      Managing Director: Wolfgang Denk
HRB 165235 Munich, Office: Kirchenstr.5, D-82194 Groebenzell, Germany
Phone: (+49)-8142-66989-51 Fax: (+49)-8142-66989-80 Email: [email protected]