[tip:,timers/urgent] clocksource/drivers/ixp4xx: Select TIMER_OF when needed
diff mbox series

Message ID 161398829842.20312.8658555102212708773.tip-bot2@tip-bot2
State Accepted
Commit 7a3b8758bd6e45f7b671723b5c9fa2b69d0787ae
Headers show
  • [tip:,timers/urgent] clocksource/drivers/ixp4xx: Select TIMER_OF when needed
Related show

Commit Message

tip-bot2 for Jan Kiszka Feb. 22, 2021, 10:04 a.m. UTC
The following commit has been merged into the timers/urgent branch of tip:

Commit-ID:     7a3b8758bd6e45f7b671723b5c9fa2b69d0787ae
Gitweb:        https://git.kernel.org/tip/7a3b8758bd6e45f7b671723b5c9fa2b69d0787ae
Author:        Arnd Bergmann <arnd@arndb.de>
AuthorDate:    Sun, 03 Jan 2021 14:59:24 +01:00
Committer:     Daniel Lezcano <daniel.lezcano@linaro.org>
CommitterDate: Mon, 18 Jan 2021 16:20:15 +01:00

clocksource/drivers/ixp4xx: Select TIMER_OF when needed

Compile-testing the ixp4xx timer with CONFIG_OF enabled but
CONFIG_TIMER_OF disabled leads to a harmless warning:

arm-linux-gnueabi-ld: warning: orphan section `__timer_of_table' from `drivers/clocksource/timer-ixp4xx.o' being placed in section `__timer_of_table'

Move the select statement from the platform code into the driver
so it always gets enabled in configurations that rely on it.

Fixes: 40df14cc5cc0 ("clocksource/drivers/ixp4xx: Add OF initialization support")
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Reviewed-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: https://lore.kernel.org/r/20210103135955.3808976-1-arnd@kernel.org
 arch/arm/mach-ixp4xx/Kconfig | 1 -
 drivers/clocksource/Kconfig  | 1 +
 2 files changed, 1 insertion(+), 1 deletion(-)

diff mbox series

diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig
index f7211b5..165c184 100644
--- a/arch/arm/mach-ixp4xx/Kconfig
+++ b/arch/arm/mach-ixp4xx/Kconfig
@@ -13,7 +13,6 @@  config MACH_IXP4XX_OF
 	select I2C
 	select I2C_IOP3XX
 	select PCI
-	select TIMER_OF
 	select USE_OF
 	  Say 'Y' here to support Device Tree-based IXP4xx platforms.
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 14c7c47..66be9ea 100644
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -79,6 +79,7 @@  config IXP4XX_TIMER
 	bool "Intel XScale IXP4xx timer driver" if COMPILE_TEST
 	depends on HAS_IOMEM
 	select CLKSRC_MMIO
+	select TIMER_OF if OF
 	  Enables support for the Intel XScale IXP4xx SoC timer.