Skip to contentSkip to conversation

ar7: fix kernel builds for compiler test

PATCH In review Jackie Liu 2 participants 2 messages Sep 7, 2021 Watchdog device drivers

lore
Share & tools
lore

Jackie Liu

author
#0 lore raw

PATCH 1/1 ar7: fix kernel builds for compiler test

From: Jackie Liu <[email protected]>

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 <[email protected]>
---
 drivers/watchdog/Kconfig | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
index 0bc7046ab942..cb5cfa31849d 100644
@@ -1691,7 +1691,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.
Signature · 1 line
2.25.1
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Jackie Liu

From: Jackie Liu <[email protected]>

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]

Quoted 6 lines
   111 |  return (readl((void *)KSEG1ADDR(AR7_REGS_GPIO + 0x24)) & 0xffff) ==
       |                        ^~~~~~~~~
       |                        CKSEG1ADDR
Fixes da2a68b3eb47 ("watchdog: Enable COMPILE_TEST where possible")
Signed-off-by Jackie Liu <[email protected]>
Reviewed-by Guenter Roeck <[email protected]>
Quoted 18 lines
---
  drivers/watchdog/Kconfig | 2 +-
  1 file changed, 1 insertion(+), 1 deletion(-)
drivers/watchdog/Kconfig +1 -1
index 0bc7046ab942..cb5cfa31849d 100644
@@ -1691,7 +1691,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.