]> git.ipfire.org Git - thirdparty/kernel/stable.git/commitdiff
ar7: fix kernel builds for compiler test
authorJackie Liu <liuyun01@kylinos.cn>
Tue, 7 Sep 2021 02:49:04 +0000 (10:49 +0800)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Wed, 17 Nov 2021 10:04:36 +0000 (11:04 +0100)
[ Upstream commit 28b7ee33a2122569ac065cad578bf23f50cc65c3 ]

TI AR7 Watchdog Timer is only build for 32bit.

Avoid error like:
In file included from drivers/watchdog/ar7_wdt.c:29:
./arch/mips/include/asm/mach-ar7/ar7.h: In function ‘ar7_is_titan’:
./arch/mips/include/asm/mach-ar7/ar7.h:111:24: error: implicit declaration of function ‘KSEG1ADDR’; did you mean ‘CKSEG1ADDR’? [-Werror=implicit-function-declaration]
  111 |  return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x24)) & 0xffff) ==
      |                        ^~~~~~~~~
      |                        CKSEG1ADDR

Fixes: da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by: Jackie Liu <liuyun01@kylinos.cn>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210907024904.4127611-1-liu.yun@linux.dev
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 71cf3f503f16b95a9f1f01bd3bc0f85bbe0ccc0a..c7be7dd56cde8a7bf0f276e368736b3865beb43d 100644 (file)
@@ -1690,7 +1690,7 @@ config SIBYTE_WDOG
 
 config AR7_WDT
        tristate "TI AR7 Watchdog Timer"
-       depends on AR7 || (MIPS && COMPILE_TEST)
+       depends on AR7 || (MIPS && 32BIT && COMPILE_TEST)
        help
          Hardware driver for the TI AR7 Watchdog Timer.