diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2021-01-03 14:59:24 +0100 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@linuxfoundation.org> | 2021-03-04 11:37:57 +0100 |
| commit | 9f5c5595cf13d9397d1af82d057edfed13f0dbaa (patch) | |
| tree | 601e0f3b2dbb607edfb1d45928171d8138e0febb | |
| parent | 884d1b0d51e0772a09b24e8f6ce47330c6e7f91b (diff) | |
| download | linux-stable-9f5c5595cf13d9397d1af82d057edfed13f0dbaa.tar.gz linux-stable-9f5c5595cf13d9397d1af82d057edfed13f0dbaa.tar.bz2 linux-stable-9f5c5595cf13d9397d1af82d057edfed13f0dbaa.zip | |
clocksource/drivers/ixp4xx: Select TIMER_OF when needed
[ Upstream commit 7a3b8758bd6e45f7b671723b5c9fa2b69d0787ae ]
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
Signed-off-by: Sasha Levin <sashal@kernel.org>
| -rw-r--r-- | arch/arm/mach-ixp4xx/Kconfig | 1 | ||||
| -rw-r--r-- | drivers/clocksource/Kconfig | 1 |
2 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-ixp4xx/Kconfig b/arch/arm/mach-ixp4xx/Kconfig index f7211b57b1e7..165c184801e1 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 help Say 'Y' here to support Device Tree-based IXP4xx platforms. diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 2be849bb794a..39f4d8866200 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 help Enables support for the Intel XScale IXP4xx SoC timer. |