diff options
| author | Arnd Bergmann <arnd@arndb.de> | 2016-01-25 11:02:49 -0500 |
|---|---|---|
| committer | Thomas Gleixner <tglx@linutronix.de> | 2016-01-26 10:26:07 -0500 |
| commit | 2be6d9bfef53d185975b44fd808aece36595e83e (patch) | |
| tree | 48834d185fdf82005553cc32270ffc4e60cee4d0 | |
| parent | 7809998ab1af22602a8463845108edc49dfb9ef0 (diff) | |
clocksource: Select CLKSRC_MMIO where needed
The Tegra clocksource implementation uses the clocksource_mmio helper
functions, but currently can be configured without them, which fails:
drivers/clocksource/built-in.o: In function `tegra20_init_timer':
:(.init.text+0xac): undefined reference to `clocksource_mmio_init'
:(.init.text+0x140): undefined reference to `clocksource_mmio_readl_up'
The same problem exists for Digicolor:
drivers/clocksource/built-in.o: In function `digicolor_timer_init':
:(.init.text+0xfa): undefined reference to `clocksource_mmio_init'
:(.init.text+0x14c): undefined reference to `clocksource_mmio_readl_down'
I've inspected the Kconfig file to look for other cases that I have not
yet run into, and added an explicit 'select' to each one to ensure we
can successfully link the drivers.
Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Cc: linux-arm-kernel@lists.infradead.org
Cc: Daniel Lezcano <daniel.lezcano@linaro.org>
Link: http://lkml.kernel.org/r/1453737776-1960372-1-git-send-email-arnd@arndb.de
Signed-off-by: Thomas Gleixner <tglx@linutronix.de>
| -rw-r--r-- | drivers/clocksource/Kconfig | 5 |
1 files changed, 5 insertions, 0 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 56777f04d2d9..f70b4f3b4857 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig | |||
| @@ -30,6 +30,7 @@ config CLKSRC_MMIO | |||
| 30 | config DIGICOLOR_TIMER | 30 | config DIGICOLOR_TIMER |
| 31 | bool "Digicolor timer driver" if COMPILE_TEST | 31 | bool "Digicolor timer driver" if COMPILE_TEST |
| 32 | depends on GENERIC_CLOCKEVENTS | 32 | depends on GENERIC_CLOCKEVENTS |
| 33 | select CLKSRC_MMIO | ||
| 33 | help | 34 | help |
| 34 | Enables the support for the digicolor timer driver. | 35 | Enables the support for the digicolor timer driver. |
| 35 | 36 | ||
| @@ -55,6 +56,7 @@ config ARMADA_370_XP_TIMER | |||
| 55 | bool "Armada 370 and XP timer driver" if COMPILE_TEST | 56 | bool "Armada 370 and XP timer driver" if COMPILE_TEST |
| 56 | depends on ARM | 57 | depends on ARM |
| 57 | select CLKSRC_OF | 58 | select CLKSRC_OF |
| 59 | select CLKSRC_MMIO | ||
| 58 | help | 60 | help |
| 59 | Enables the support for the Armada 370 and XP timer driver. | 61 | Enables the support for the Armada 370 and XP timer driver. |
| 60 | 62 | ||
| @@ -89,6 +91,7 @@ config SUN5I_HSTIMER | |||
| 89 | 91 | ||
| 90 | config TEGRA_TIMER | 92 | config TEGRA_TIMER |
| 91 | bool "Tegra timer driver" if COMPILE_TEST | 93 | bool "Tegra timer driver" if COMPILE_TEST |
| 94 | select CLKSRC_MMIO | ||
| 92 | depends on ARM | 95 | depends on ARM |
| 93 | help | 96 | help |
| 94 | Enables support for the Tegra driver. | 97 | Enables support for the Tegra driver. |
| @@ -263,6 +266,7 @@ config FSL_FTM_TIMER | |||
| 263 | 266 | ||
| 264 | config VF_PIT_TIMER | 267 | config VF_PIT_TIMER |
| 265 | bool | 268 | bool |
| 269 | select CLKSRC_MMIO | ||
| 266 | help | 270 | help |
| 267 | Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. | 271 | Support for Period Interrupt Timer on Freescale Vybrid Family SoCs. |
| 268 | 272 | ||
| @@ -394,6 +398,7 @@ config CLKSRC_ST_LPC | |||
| 394 | bool "Low power clocksource found in the LPC" if COMPILE_TEST | 398 | bool "Low power clocksource found in the LPC" if COMPILE_TEST |
| 395 | select CLKSRC_OF if OF | 399 | select CLKSRC_OF if OF |
| 396 | depends on HAS_IOMEM | 400 | depends on HAS_IOMEM |
| 401 | select CLKSRC_MMIO | ||
| 397 | help | 402 | help |
| 398 | Enable this option to use the Low Power controller timer | 403 | Enable this option to use the Low Power controller timer |
| 399 | as clocksource. | 404 | as clocksource. |
