Merge branch 'core/urgent' into smp/hotplug to pick up dependencies

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

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index c350fbd805d72899b9e8726ad6cf72189fb2a0f9..567788664723d5b341000af69cc4e6194ab9025d 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -191,6 +191,36 @@ config PRIMA2_TIMER
        help
          Enables support for the Prima2 timer.
 
+config U300_TIMER
+       bool "U300 timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       depends on ARM
+       select CLKSRC_MMIO
+       help
+         Enables support for the U300 timer.
+
+config NSPIRE_TIMER
+       bool "NSpire timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables support for the Nspire timer.
+
+config KEYSTONE_TIMER
+       bool "Keystone timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       depends on ARM || ARM64
+       select CLKSRC_MMIO
+       help
+         Enables support for the Keystone timer.
+
+config INTEGRATOR_AP_TIMER
+       bool "Integrator-ap timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables support for the Integrator-ap timer.
+
 config CLKSRC_DBX500_PRCMU_SCHED_CLOCK
        bool "Clocksource PRCMU Timer sched_clock"
        depends on (CLKSRC_DBX500_PRCMU && !CLKSRC_NOMADIK_MTU_SCHED_CLOCK)
@@ -258,14 +288,16 @@ config ARM_ARCH_TIMER
        select CLKSRC_ACPI if ACPI
 
 config ARM_ARCH_TIMER_EVTSTREAM
-       bool "Support for ARM architected timer event stream generation"
+       bool "Enable ARM architected timer event stream generation by default"
        default y if ARM_ARCH_TIMER
        depends on ARM_ARCH_TIMER
        help
-         This option enables support for event stream generation based on
-         the ARM architected timer. It is used for waking up CPUs executing
-         the wfe instruction at a frequency represented as a power-of-2
-         divisor of the clock rate.
+         This option enables support by default for event stream generation
+         based on the ARM architected timer. It is used for waking up CPUs
+         executing the wfe instruction at a frequency represented as a
+         power-of-2 divisor of the clock rate. The behaviour can also be
+         overridden on the command line using the
+         clocksource.arm_arch_timer.evtstream parameter.
          The main use of the event stream is wfe-based timeouts of userspace
          locking implementations. It might also be useful for imposing timeout
          on wfe to safeguard against any programming errors in case an expected
@@ -274,8 +306,9 @@ config ARM_ARCH_TIMER_EVTSTREAM
          hardware anomalies of missing events.
 
 config ARM_GLOBAL_TIMER
-       bool
+       bool "Support for the ARM global timer" if COMPILE_TEST
        select CLKSRC_OF if OF
+       depends on ARM
        help
          This options enables support for the ARM global timer unit
 
@@ -304,9 +337,12 @@ config ATMEL_PIT
        def_bool SOC_AT91SAM9 || SOC_SAMA5
 
 config ATMEL_ST
-       bool
+       bool "Atmel ST timer support" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
        select CLKSRC_OF
        select MFD_SYSCON
+       help
+         Support for the Atmel ST timer.
 
 config CLKSRC_METAG_GENERIC
        def_bool y if METAG
@@ -419,8 +455,8 @@ config CLKSRC_QCOM
          Qualcomm SoCs.
 
 config CLKSRC_VERSATILE
-       bool "ARM Versatile (Express) reference platforms clock source"
-       depends on PLAT_VERSATILE && GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
+       bool "ARM Versatile (Express) reference platforms clock source" if COMPILE_TEST
+       depends on GENERIC_SCHED_CLOCK && !ARCH_USES_GETTIMEOFFSET
        select CLKSRC_OF
        default y if MFD_VEXPRESS_SYSREG
        help