Merge branch 'linux-linaro-lsk-v4.4-android' of git://git.linaro.org/kernel/linux...

[firefly-linux-kernel-4.4.55.git] / arch / arm / Kconfig

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index f4a214446b803effdef5447ac0b7497b65353a26..868a5f2a1cce20b898258fb0d8d5c02bacf17adb 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -39,6 +39,7 @@ config ARM
        select HAVE_ARCH_HARDENED_USERCOPY
        select HAVE_ARCH_SECCOMP_FILTER if (AEABI && !OABI_COMPAT)
        select HAVE_ARCH_TRACEHOOK
+       select HAVE_ARM_SMCCC if CPU_V7
        select HAVE_BPF_JIT
        select HAVE_CC_STACKPROTECTOR
        select HAVE_CONTEXT_TRACKING
@@ -106,27 +107,7 @@ config ARM_DMA_USE_IOMMU
        bool
        select ARM_HAS_SG_CHAIN
        select NEED_SG_DMA_LENGTH
-
-if ARM_DMA_USE_IOMMU
-
-config ARM_DMA_IOMMU_ALIGNMENT
-       int "Maximum PAGE_SIZE order of alignment for DMA IOMMU buffers"
-       range 4 9
-       default 8
-       help
-         DMA mapping framework by default aligns all buffers to the smallest
-         PAGE_SIZE order which is greater than or equal to the requested buffer
-         size. This works well for buffers up to a few hundreds kilobytes, but
-         for larger buffers it just a waste of address space. Drivers which has
-         relatively small addressing window (like 64Mib) might run out of
-         virtual space with just a few allocations.
-
-         With this parameter you can specify the maximum PAGE_SIZE order for
-         DMA IOMMU buffers. Larger buffers will be aligned only to this
-         specified order. The order is expressed as a power of two multiplied
-         by the PAGE_SIZE.
-
-endif
+       select IOMMU_DMA
 
 config MIGHT_HAVE_PCI
        bool
@@ -1491,7 +1472,7 @@ config HOTPLUG_CPU
 
 config ARM_PSCI
        bool "Support for the ARM Power State Coordination Interface (PSCI)"
-       depends on CPU_V7
+       depends on HAVE_ARM_SMCCC
        select ARM_PSCI_FW
        help
          Say Y here if you want Linux to communicate with system firmware