Merge git://git.kernel.org/pub/scm/linux/kernel/git/davem/net

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

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 6bbd3d8..2451908 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -27,6 +27,20 @@ config CLKBLD_I8253
 config CLKSRC_MMIO
        bool
 
+config BCM2835_TIMER
+       bool "BCM2835 timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables the support for the BCM2835 timer driver.
+
+config BCM_KONA_TIMER
+       bool "BCM mobile timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables the support for the BCM Kona mobile timer driver.
+
 config DIGICOLOR_TIMER
        bool "Digicolor timer driver" if COMPILE_TEST
        depends on GENERIC_CLOCKEVENTS
@@ -141,6 +155,72 @@ config CLKSRC_DBX500_PRCMU
        help
          Use the always on PRCMU Timer as clocksource
 
+config CLPS711X_TIMER
+       bool "Cirrus logic timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables support for the Cirrus Logic PS711 timer.
+
+config ATLAS7_TIMER
+       bool "Atlas7 timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables support for the Atlas7 timer.
+
+config MOXART_TIMER
+       bool "Moxart timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       help
+         Enables support for the Moxart timer.
+
+config MXS_TIMER
+       bool "Mxs timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       select STMP_DEVICE
+       help
+         Enables support for the Mxs timer.
+
+config PRIMA2_TIMER
+       bool "Prima2 timer driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_MMIO
+       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)
@@ -208,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
@@ -223,9 +305,20 @@ config ARM_ARCH_TIMER_EVTSTREAM
          This must be disabled for hardware validation purposes to detect any
          hardware anomalies of missing events.
 
+config FSL_ERRATUM_A008585
+       bool "Workaround for Freescale/NXP Erratum A-008585"
+       default y
+       depends on ARM_ARCH_TIMER && ARM64
+       help
+         This option enables a workaround for Freescale/NXP Erratum
+         A-008585 ("ARM generic timer may contain an erroneous
+         value").  The workaround will only be active if the
+         fsl,erratum-a008585 property is found in the timer node.
+
 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
 
@@ -243,7 +336,7 @@ config CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
         Use ARM global timer clock source as sched_clock
 
 config ARMV7M_SYSTICK
-       bool
+       bool "Support for the ARMv7M system time" if COMPILE_TEST
        select CLKSRC_OF if OF
        select CLKSRC_MMIO
        help
@@ -254,9 +347,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
@@ -265,7 +361,7 @@ config CLKSRC_METAG_GENERIC
 
 config CLKSRC_EXYNOS_MCT
        bool "Exynos multi core timer driver" if COMPILE_TEST
-       depends on ARM
+       depends on ARM || ARM64
        help
          Support for Multi Core Timer controller on Exynos SoCs.
 
@@ -293,6 +389,14 @@ config VF_PIT_TIMER
        help
          Support for Period Interrupt Timer on Freescale Vybrid Family SoCs.
 
+config OXNAS_RPS_TIMER
+       bool "Oxford Semiconductor OXNAS RPS Timers driver" if COMPILE_TEST
+       depends on GENERIC_CLOCKEVENTS
+       select CLKSRC_OF
+       select CLKSRC_MMIO
+       help
+         This enables support for the Oxford Semiconductor OXNAS RPS timers.
+
 config SYS_SUPPORTS_SH_CMT
         bool
 
@@ -361,8 +465,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