Merge tag 'trace-seq-buf-3.19' of git://git.kernel.org/pub/scm/linux/kernel/git/roste...

[cascardo/linux.git] / arch / arm / mach-imx / Kconfig

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index 11b2957..e8627e0 100644 (file)
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -633,12 +633,41 @@ config SOC_VF610
        bool "Vybrid Family VF610 support"
        select ARM_GIC
        select PINCTRL_VF610
-       select VF_PIT_TIMER
        select PL310_ERRATA_769419 if CACHE_L2X0
 
        help
          This enable support for Freescale Vybrid VF610 processor.
 
+choice
+       prompt "Clocksource for scheduler clock"
+       depends on SOC_VF610
+       default VF_USE_ARM_GLOBAL_TIMER
+
+       config VF_USE_ARM_GLOBAL_TIMER
+               bool "Use ARM Global Timer"
+               select ARM_GLOBAL_TIMER
+               select CLKSRC_ARM_GLOBAL_TIMER_SCHED_CLOCK
+               help
+                 Use the ARM Global Timer as clocksource
+
+       config VF_USE_PIT_TIMER
+               bool "Use PIT timer"
+               select VF_PIT_TIMER
+               help
+                 Use SoC Periodic Interrupt Timer (PIT) as clocksource
+
+endchoice
+
+config SOC_LS1021A
+       bool "Freescale LS1021A support"
+       select ARM_GIC
+       select HAVE_ARM_ARCH_TIMER
+       select PCI_DOMAINS if PCI
+       select ZONE_DMA if ARM_LPAE
+
+       help
+         This enable support for Freescale LS1021A processor.
+
 endif
 
 source "arch/arm/mach-imx/devices/Kconfig"