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

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

diff --git a/arch/arm/mach-highbank/Kconfig b/arch/arm/mach-highbank/Kconfig
index b8466fb00f55aa8e1a7e3358740fc46ef524e4e3..31aa866c33171aa107075e39d03551824a7fb51a 100644 (file)
--- a/arch/arm/mach-highbank/Kconfig
+++ b/arch/arm/mach-highbank/Kconfig
@@ -1,21 +1,18 @@
 config ARCH_HIGHBANK
        bool "Calxeda ECX-1000/2000 (Highbank/Midway)" if ARCH_MULTI_V7
-       select ARCH_HAS_CPUFREQ
-       select ARCH_HAS_OPP
+       select ARCH_DMA_ADDR_T_64BIT if ARM_LPAE
+       select ARCH_HAS_HOLES_MEMORYMODEL
        select ARCH_SUPPORTS_BIG_ENDIAN
-       select ARCH_WANT_OPTIONAL_GPIOLIB
        select ARM_AMBA
+       select ARM_ERRATA_764369 if SMP
+       select ARM_ERRATA_775420
+       select ARM_ERRATA_798181 if SMP
        select ARM_GIC
+       select ARM_PSCI
        select ARM_TIMER_SP804
        select CACHE_L2X0
-       select CLKDEV_LOOKUP
-       select COMMON_CLK
-       select CPU_V7
-       select GENERIC_CLOCKEVENTS
        select HAVE_ARM_SCU
-       select HAVE_ARM_TWD if LOCAL_TIMERS
-       select HAVE_SMP
+       select HAVE_ARM_TWD if SMP
        select MAILBOX
        select PL320_MBOX
-       select SPARSE_IRQ
-       select USE_OF
+       select ZONE_DMA if ARM_LPAE