Merge branch 'timers-core-for-linus' of git://git.kernel.org/pub/scm/linux/kernel...

[cascardo/linux.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 8a1479f..717f40e 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -18,6 +18,9 @@ config CLKBLD_I8253
 config CLKSRC_MMIO
        bool
 
+config DIGICOLOR_TIMER
+       bool
+
 config DW_APB_TIMER
        bool
 
@@ -26,6 +29,10 @@ config DW_APB_TIMER_OF
        select DW_APB_TIMER
        select CLKSRC_OF
 
+config ROCKCHIP_TIMER
+       bool
+       select CLKSRC_OF
+
 config ARMADA_370_XP_TIMER
        bool
        select CLKSRC_OF
@@ -236,4 +243,14 @@ config CLKSRC_PXA
          This enables OST0 support available on PXA and SA-11x0
          platforms.
 
+config ASM9260_TIMER
+       bool "Alphascale ASM9260 timer driver"
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       select CLKSRC_OF
+       default y if MACH_ASM9260
+       help
+         This enables build of a clocksource and clockevent driver for
+         the 32-bit System Timer hardware available on a Alphascale ASM9260.
+
 endmenu