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

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

diff --git a/arch/arm/mach-exynos/Kconfig b/arch/arm/mach-exynos/Kconfig
index bb3b09aa9183a4628476703b448d5be88b882040..91d5b6f1d5afa80c6c0fbb5d35a88af1a2750838 100644 (file)
--- a/arch/arm/mach-exynos/Kconfig
+++ b/arch/arm/mach-exynos/Kconfig
@@ -68,6 +68,15 @@ config SOC_EXYNOS5250
        help
          Enable EXYNOS5250 SoC support
 
+config SOC_EXYNOS5440
+       bool "SAMSUNG EXYNOS5440"
+       default y
+       depends on ARCH_EXYNOS5
+       select ARM_ARCH_TIMER
+       select AUTO_ZRELADDR
+       help
+         Enable EXYNOS5440 SoC support
+
 config EXYNOS4_MCT
        bool
        default y
@@ -99,11 +108,6 @@ config EXYNOS_DEV_SYSMMU
        help
          Common setup code for SYSTEM MMU in EXYNOS platforms
 
-config EXYNOS4_DEV_DWMCI
-       bool
-       help
-         Compile in platform device definitions for DWMCI
-
 config EXYNOS4_DEV_USB_OHCI
        bool
        help
@@ -418,9 +422,9 @@ config MACH_EXYNOS4_DT
 
 config MACH_EXYNOS5_DT
        bool "SAMSUNG EXYNOS5 Machine using device tree"
+       default y
        depends on ARCH_EXYNOS5
        select ARM_AMBA
-       select SOC_EXYNOS5250
        select USE_OF
        help
          Machine support for Samsung EXYNOS5 machine with device tree enabled.