Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/hskinnemoen/tclib into base

1 files changed, 33 insertions, 0 deletions

diff --git a/drivers/misc/Kconfig b/drivers/misc/Kconfig
index 962817e49fba..bb94ce78a6d0 100644
--- a/drivers/misc/Kconfig
+++ b/drivers/misc/Kconfig
@@ -22,6 +22,39 @@ config ATMEL_PWM
           purposes including software controlled power-efficent backlights
           on LCD displays, motor control, and waveform generation.
 
+config ATMEL_TCLIB
+        bool "Atmel AT32/AT91 Timer/Counter Library"
+        depends on (AVR32 || ARCH_AT91)
+        help
+          Select this if you want a library to allocate the Timer/Counter
+          blocks found on many Atmel processors.  This facilitates using
+          these blocks by different drivers despite processor differences.
+
+config ATMEL_TCB_CLKSRC
+        bool "TC Block Clocksource"
+        depends on ATMEL_TCLIB && GENERIC_TIME
+        default y
+        help
+          Select this to get a high precision clocksource based on a
+          TC block with a 5+ MHz base clock rate.  Two timer channels
+          are combined to make a single 32-bit timer.
+
+          When GENERIC_CLOCKEVENTS is defined, the third timer channel
+          may be used as a clock event device supporting oneshot mode
+          (delays of up to two seconds) based on the 32 KiHz clock.
+
+config ATMEL_TCB_CLKSRC_BLOCK
+        int
+        depends on ATMEL_TCB_CLKSRC
+        prompt "TC Block" if ARCH_AT91RM9200 || ARCH_AT91SAM9260 || CPU_AT32AP700X
+        default 0
+        range 0 1
+        help
+          Some chips provide more than one TC block, so you have the
+          choice of which one to use for the clock framework.  The other
+          TC can be used for other purposes, such as PWM generation and
+          interval timing.
+
 config IBM_ASM
         tristate "Device driver for IBM RSA service processor"
         depends on X86 && PCI && INPUT && EXPERIMENTAL