]> git.ipfire.org Git - thirdparty/kernel/linux.git/commitdiff
watchdog: convert the Kconfig dependency on OF_GPIO to OF
authorBartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
Wed, 6 May 2026 08:16:00 +0000 (10:16 +0200)
committerGuenter Roeck <linux@roeck-us.net>
Sun, 10 May 2026 15:31:34 +0000 (08:31 -0700)
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 <linux@roeck-us.net>
Signed-off-by: Bartosz Golaszewski <bartosz.golaszewski@oss.qualcomm.com>
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 <linux@roeck-us.net>
drivers/watchdog/Kconfig

index d1d2cdbd199554e4e7c1c68e6743277aba92bcac..a8fc1d7a5031cf8d7d3f0caeac1d573cbd08d465 100644 (file)
@@ -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