From: Bartosz Golaszewski Date: Wed, 6 May 2026 08:16:00 +0000 (+0200) Subject: watchdog: convert the Kconfig dependency on OF_GPIO to OF X-Git-Url: http://git.ipfire.org/gitweb/index.cgi?a=commitdiff_plain;h=63e07a8ecb1ea9ac5cdcb267244716d38c942b30;p=thirdparty%2Fkernel%2Flinux.git watchdog: convert the Kconfig dependency on OF_GPIO to OF OF_GPIO is selected automatically on all OF systems. Any symbols it controls also provide stubs so there's really no reason to select it explicitly. We could simply remove the dependency but in order to avoid a new symbol popping up for everyone in make config - just convert it to requiring CONFIG_OF. Reviewed-by: Guenter Roeck Signed-off-by: Bartosz Golaszewski Link: https://lore.kernel.org/r/20260506081600.4921-1-bartosz.golaszewski@oss.qualcomm.com [groeck: Resolved conflict; updated dependencies to require OF _or_ ACPI] Signed-off-by: Guenter Roeck --- diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index d1d2cdbd19955..a8fc1d7a5031c 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -250,7 +250,7 @@ config DA9062_WATCHDOG config GPIO_WATCHDOG tristate "Watchdog device controlled through GPIO-line" - depends on (ACPI && GPIOLIB) || OF_GPIO + depends on GPIOLIB && (ACPI || OF) select WATCHDOG_CORE help If you say yes here you get support for watchdog device