]> www.infradead.org Git - users/dwmw2/linux.git/commitdiff
watchdog: coh901327: add COMMON_CLK dependency
authorArnd Bergmann <arnd@arndb.de>
Thu, 3 Dec 2020 22:33:42 +0000 (23:33 +0100)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Tue, 29 Dec 2020 12:47:02 +0000 (13:47 +0100)
[ Upstream commit 36c47df85ee8e1f8a35366ac11324f8875de00eb ]

clang produces a build failure in configurations without COMMON_CLK
when a timeout calculation goes wrong:

arm-linux-gnueabi-ld: drivers/watchdog/coh901327_wdt.o: in function `coh901327_enable':
coh901327_wdt.c:(.text+0x50): undefined reference to `__bad_udelay'

Add a Kconfig dependency to only do build testing when COMMON_CLK
is enabled.

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20201203223358.1269372-1-arnd@kernel.org
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
drivers/watchdog/Kconfig

index 529b0527bf2e23b9465aee72d7fc10b2467a3e19..de228669a2c8b909bec177a84b9de90d277a11be 100644 (file)
@@ -495,7 +495,7 @@ config SUNXI_WATCHDOG
 
 config COH901327_WATCHDOG
        bool "ST-Ericsson COH 901 327 watchdog"
-       depends on ARCH_U300 || (ARM && COMPILE_TEST)
+       depends on ARCH_U300 || (ARM && COMMON_CLK && COMPILE_TEST)
        default y if MACH_U300
        select WATCHDOG_CORE
        help