| From 9589f83a4d1f787ebd47ea5c572aad0816796405 Mon Sep 17 00:00:00 2001 |
| From: Sasha Levin <sashal@kernel.org> |
| Date: Tue, 7 Sep 2021 10:49:04 +0800 |
| Subject: ar7: fix kernel builds for compiler test |
| MIME-Version: 1.0 |
| Content-Type: text/plain; charset=UTF-8 |
| Content-Transfer-Encoding: 8bit |
| |
| From: Jackie Liu <liuyun01@kylinos.cn> |
| |
| [ 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 | 2 +- |
| 1 file changed, 1 insertion(+), 1 deletion(-) |
| |
| diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig |
| index 1aa42e879e633..3fabd4177b0ee 100644 |
| --- a/drivers/watchdog/Kconfig |
| +++ b/drivers/watchdog/Kconfig |
| @@ -1682,7 +1682,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. |
| |
| -- |
| 2.33.0 |
| |
