Merge tag 'dt-for-3.17' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc

[firefly-linux-kernel-4.4.55.git] / drivers / clocksource / Kconfig

diff --git a/drivers/clocksource/Kconfig b/drivers/clocksource/Kconfig
index 065131cbfcc01b9c2f32b70600882c124dca4e06..cfd6519df6615fc1a9268fcaf092859adf4323c9 100644 (file)
--- a/drivers/clocksource/Kconfig
+++ b/drivers/clocksource/Kconfig
@@ -1,3 +1,5 @@
+menu "Clock Source drivers"
+
 config CLKSRC_OF
        bool
 
@@ -125,6 +127,7 @@ config CLKSRC_METAG_GENERIC
 
 config CLKSRC_EXYNOS_MCT
        def_bool y if ARCH_EXYNOS
+       depends on !ARM64
        help
          Support for Multi Core Timer controller on Exynos SoCs.
 
@@ -149,6 +152,11 @@ config VF_PIT_TIMER
 config SYS_SUPPORTS_SH_CMT
         bool
 
+config MTK_TIMER
+       select CLKSRC_OF
+       select CLKSRC_MMIO
+       bool
+
 config SYS_SUPPORTS_SH_MTU2
         bool
 
@@ -173,7 +181,7 @@ config SH_TIMER_MTU2
        default SYS_SUPPORTS_SH_MTU2
        help
          This enables build of a clockevent driver for the Multi-Function
-         Timer Pulse Unit 2 (TMU2) hardware available on SoCs from Renesas.
+         Timer Pulse Unit 2 (MTU2) hardware available on SoCs from Renesas.
          This hardware comes with 16 bit-timer registers.
 
 config SH_TIMER_TMU
@@ -187,7 +195,7 @@ config SH_TIMER_TMU
 
 config EM_TIMER_STI
        bool "Renesas STI timer driver" if COMPILE_TEST
-       depends on GENERIC_CLOCKEVENTS
+       depends on GENERIC_CLOCKEVENTS && HAS_IOMEM
        default SYS_SUPPORTS_EM_STI
        help
          This enables build of a clocksource and clockevent driver for
@@ -207,3 +215,5 @@ config CLKSRC_VERSATILE
          counter available in the "System Registers" block of
          ARM Versatile, RealView and Versatile Express reference
          platforms.
+
+endmenu