diff options
author | Dmitry Eremin-Solenikov <dbaryshkov@gmail.com> | 2014-12-21 10:07:09 -0500 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2015-01-14 06:28:29 -0500 |
commit | e074ff86e8b4f4f7983ff9b752bc904c8a729900 (patch) | |
tree | 03557ef191e549bec9bfacdcd9033969387a9af4 /drivers/clocksource | |
parent | ee3a4020f7c91ffc3c1a680c88652371b9711809 (diff) |
ARM: 8251/1: clocksource: enable pxa_timer for SA-1100 platform
SA-11x0 platform used the same IP block as was used on PXA. Consequently
it makes sense to have only one driver. Enable pxa_timer clocksource for
StrongARM platform.
Signed-off-by: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Acked-by: Thomas Gleixner <tglx@linutronix.de>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'drivers/clocksource')
-rw-r--r-- | drivers/clocksource/Kconfig | 7 | ||||
-rw-r--r-- | drivers/clocksource/Makefile | 2 |
2 files changed, 8 insertions, 1 deletions
diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig index fc01ec27d3c8..8a1479fc6479 100644 --- a/drivers/clocksource/Kconfig +++ b/drivers/clocksource/Kconfig | |||
@@ -229,4 +229,11 @@ config CLKSRC_MIPS_GIC | |||
229 | depends on MIPS_GIC | 229 | depends on MIPS_GIC |
230 | select CLKSRC_OF | 230 | select CLKSRC_OF |
231 | 231 | ||
232 | config CLKSRC_PXA | ||
233 | def_bool y if ARCH_PXA || ARCH_SA1100 | ||
234 | select CLKSRC_OF if USE_OF | ||
235 | help | ||
236 | This enables OST0 support available on PXA and SA-11x0 | ||
237 | platforms. | ||
238 | |||
232 | endmenu | 239 | endmenu |
diff --git a/drivers/clocksource/Makefile b/drivers/clocksource/Makefile index 94d90b24b56b..aa526f4bd3cf 100644 --- a/drivers/clocksource/Makefile +++ b/drivers/clocksource/Makefile | |||
@@ -21,7 +21,7 @@ obj-$(CONFIG_ARCH_CLPS711X) += clps711x-timer.o | |||
21 | obj-$(CONFIG_ARCH_MARCO) += timer-marco.o | 21 | obj-$(CONFIG_ARCH_MARCO) += timer-marco.o |
22 | obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o | 22 | obj-$(CONFIG_ARCH_MOXART) += moxart_timer.o |
23 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o | 23 | obj-$(CONFIG_ARCH_MXS) += mxs_timer.o |
24 | obj-$(CONFIG_ARCH_PXA) += pxa_timer.o | 24 | obj-$(CONFIG_CLKSRC_PXA) += pxa_timer.o |
25 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o | 25 | obj-$(CONFIG_ARCH_PRIMA2) += timer-prima2.o |
26 | obj-$(CONFIG_ARCH_U300) += timer-u300.o | 26 | obj-$(CONFIG_ARCH_U300) += timer-u300.o |
27 | obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o | 27 | obj-$(CONFIG_SUN4I_TIMER) += sun4i_timer.o |