Merge remote-tracking branch 'pm/linux-next'

[karo-tx-linux.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 1a9c5dc1e5f9c54de7fc77834de21719ea4258fb..71cfdf7c97086273b1cc8ae1235ecf919abcfda1 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -123,6 +123,14 @@ config CLKSRC_PISTACHIO
        bool
        select CLKSRC_OF
 
+config CLKSRC_TI_32K
+       bool "Texas Instruments 32.768 Hz Clocksource" if COMPILE_TEST
+       depends on GENERIC_SCHED_CLOCK
+       select CLKSRC_OF if OF
+       help
+         This option enables support for Texas Instruments 32.768 Hz clocksource
+         available on many OMAP-like platforms.
+
 config CLKSRC_STM32
        bool "Clocksource for STM32 SoCs" if !ARCH_STM32
        depends on OF && ARM && (ARCH_STM32 || COMPILE_TEST)
@@ -288,6 +296,10 @@ config CLKSRC_MIPS_GIC
        depends on MIPS_GIC
        select CLKSRC_OF
 
+config CLKSRC_TANGO_XTAL
+       bool
+       select CLKSRC_OF
+
 config CLKSRC_PXA
        def_bool y if ARCH_PXA || ARCH_SA1100
        select CLKSRC_OF if OF