Merge tag 'iommu-updates-v3.5' of git://git.kernel.org/pub/scm/linux/kernel/git/joro...

[karo-tx-linux.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index 76edcfe8b56f3d6ecad86a7fadeebbcef0b20d3d..5e7601301b416c29fe3fa0905ee90a9ac4931e94 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -1,9 +1,13 @@
 config ARM
        bool
        default y
+       select ARCH_HAVE_CUSTOM_GPIO_H
        select HAVE_AOUT
        select HAVE_DMA_API_DEBUG
        select HAVE_IDE if PCI || ISA || PCMCIA
+       select HAVE_DMA_ATTRS
+       select HAVE_DMA_CONTIGUOUS if (CPU_V6 || CPU_V6K || CPU_V7)
+       select CMA if (CPU_V6 || CPU_V6K || CPU_V7)
        select HAVE_MEMBLOCK
        select RTC_LIB
        select SYS_SUPPORTS_APM_EMULATION
@@ -40,6 +44,8 @@ config ARM
        select GENERIC_PCI_IOMAP
        select HAVE_BPF_JIT
        select GENERIC_SMP_IDLE_THREAD
+       select KTIME_SCALAR
+       select GENERIC_CLOCKEVENTS_BROADCAST if SMP
        help
          The ARM series is a line of low-power-consumption RISC chip designs
          licensed by ARM Ltd and targeted at embedded applications and
@@ -51,33 +57,25 @@ config ARM
 config ARM_HAS_SG_CHAIN
        bool
 
-config HAVE_PWM
-       bool
-
-config MIGHT_HAVE_PCI
-       bool
-
-config SYS_SUPPORTS_APM_EMULATION
+config NEED_SG_DMA_LENGTH
        bool
 
-config GENERIC_GPIO
+config ARM_DMA_USE_IOMMU
+       select NEED_SG_DMA_LENGTH
+       select ARM_HAS_SG_CHAIN
        bool
 
-config ARCH_USES_GETTIMEOFFSET
+config HAVE_PWM
        bool
-       default n
 
-config GENERIC_CLOCKEVENTS
+config MIGHT_HAVE_PCI
        bool
 
-config GENERIC_CLOCKEVENTS_BROADCAST
+config SYS_SUPPORTS_APM_EMULATION
        bool
-       depends on GENERIC_CLOCKEVENTS
-       default y if SMP
 
-config KTIME_SCALAR
+config GENERIC_GPIO
        bool
-       default y
 
 config HAVE_TCM
        bool
@@ -107,14 +105,6 @@ config EISA
 config SBUS
        bool
 
-config MCA
-       bool
-       help
-         MicroChannel Architecture is found in some IBM PS/2 machines and
-         laptops.  It is a bus system similar to PCI or ISA. See
-         <file:Documentation/mca.txt> (and especially the web page given
-         there) before attempting to build an MCA bus kernel.
-
 config STACKTRACE_SUPPORT
        bool
        default y
@@ -466,8 +456,10 @@ config ARCH_MXS
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
+       select COMMON_CLK
        select HAVE_CLK_PREPARE
        select PINCTRL
+       select USE_OF
        help
          Support for Freescale MXS-based family of processors
 
@@ -957,6 +949,7 @@ config PLAT_SPEAR
        select ARM_AMBA
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
+       select COMMON_CLK
        select CLKSRC_MMIO
        select GENERIC_CLOCKEVENTS
        select HAVE_CLK
@@ -1061,7 +1054,6 @@ source "arch/arm/mach-sa1100/Kconfig"
 
 source "arch/arm/plat-samsung/Kconfig"
 source "arch/arm/plat-s3c24xx/Kconfig"
-source "arch/arm/plat-s5p/Kconfig"
 
 source "arch/arm/plat-spear/Kconfig"
 
@@ -1112,6 +1104,7 @@ config PLAT_ORION
        bool
        select CLKSRC_MMIO
        select GENERIC_IRQ_CHIP
+       select COMMON_CLK
 
 config PLAT_PXA
        bool
@@ -1446,8 +1439,6 @@ endmenu
 
 menu "Kernel Features"
 
-source "kernel/time/Kconfig"
-
 config HAVE_SMP
        bool
        help