diff options
author | Linus Walleij <linus.walleij@linaro.org> | 2012-10-18 08:01:25 -0400 |
---|---|---|
committer | Linus Walleij <linus.walleij@linaro.org> | 2012-11-05 03:55:33 -0500 |
commit | 694e33a7f42de7dcc8b43c3990c597b19ef9b438 (patch) | |
tree | 02b6995f41eab4474fd8d9df419775825a13b362 /drivers/clocksource/Kconfig | |
parent | 865fab601b8f910b2c634cf4c9211176f2c71cad (diff) |
ARM: plat-nomadik: move MTU, kill plat-nomadik
This moves the MTU timer driver from arch/arm/plat-nomadik
to drivers/clocksource and moves the header file to the
platform_data directory.
As this moves the last file being compiled to an object out
of arch/arm/plat-nomadik, we have to "turn off the light"
and delete the plat-nomadik directory, because it is not
allowed to have an empty Makefile in a plat-* directory.
This is probably also a desired side effect of depopulating
the arch/arm directory of drivers. Luckily we have just
deleted all the <plat/*> include files prior to this so
by moving the last one we may delete the directory.
After this all the Ux500 and Nomadik device drivers live
outside of the arch/arm hierarchy.
Cc: Alessandro Rubini <rubini@unipv.it>
Acked-by: Arnd Bergmann <arnd@arndb.de>
Signed-off-by: Linus Walleij <linus.walleij@linaro.org>
Diffstat (limited to 'drivers/clocksource/Kconfig')
-rw-r--r-- | drivers/clocksource/Kconfig | 17 |
1 files changed, 16 insertions, 1 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index 6a78073c3808..c9f67de8b7b4 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig | |||
@@ -22,6 +22,21 @@ config DW_APB_TIMER_OF | |||
22 | config ARMADA_370_XP_TIMER | 22 | config ARMADA_370_XP_TIMER |
23 | bool | 23 | bool |
24 | 24 | ||
25 | config CLKSRC_NOMADIK_MTU | ||
26 | bool | ||
27 | depends on (ARCH_NOMADIK || ARCH_U8500) | ||
28 | select CLKSRC_MMIO | ||
29 | help | ||
30 | Support for Multi Timer Unit. MTU provides access | ||
31 | to multiple interrupt generating programmable | ||
32 | 32-bit free running decrementing counters. | ||
33 | |||
34 | config CLKSRC_NOMADIK_MTU_SCHED_CLOCK | ||
35 | bool | ||
36 | depends on CLKSRC_NOMADIK_MTU | ||
37 | help | ||
38 | Use the Multi Timer Unit as the sched_clock. | ||
39 | |||
25 | config CLKSRC_DBX500_PRCMU | 40 | config CLKSRC_DBX500_PRCMU |
26 | bool "Clocksource PRCMU Timer" | 41 | bool "Clocksource PRCMU Timer" |
27 | depends on UX500_SOC_DB8500 | 42 | depends on UX500_SOC_DB8500 |
@@ -31,7 +46,7 @@ config CLKSRC_DBX500_PRCMU | |||
31 | 46 | ||
32 | config CLKSRC_DBX500_PRCMU_SCHED_CLOCK | 47 | config CLKSRC_DBX500_PRCMU_SCHED_CLOCK |
33 | bool "Clocksource PRCMU Timer sched_clock" | 48 | bool "Clocksource PRCMU Timer sched_clock" |
34 | depends on (CLKSRC_DBX500_PRCMU && !NOMADIK_MTU_SCHED_CLOCK) | 49 | depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK) |
35 | default y | 50 | default y |
36 | help | 51 | help |
37 | Use the always on PRCMU Timer as sched_clock | 52 | Use the always on PRCMU Timer as sched_clock |