Merge branch 'spear/dt' into next/dt2

[deliverable/linux.git] / arch / arm / mach-ux500 / Kconfig

diff --git a/arch/arm/mach-ux500/Kconfig b/arch/arm/mach-ux500/Kconfig
index 52af00446a6335ff9fd5bb1fccbd9a3d8805caae..ea908c66aebd3d0d367753fa2e6249890eafc26e 100644 (file)
--- a/arch/arm/mach-ux500/Kconfig
+++ b/arch/arm/mach-ux500/Kconfig
@@ -5,7 +5,7 @@ config UX500_SOC_COMMON
        default y
        select ARM_GIC
        select HAS_MTU
-       select ARM_ERRATA_753970
+       select PL310_ERRATA_753970
        select ARM_ERRATA_754322
        select ARM_ERRATA_764369
 
@@ -28,6 +28,7 @@ config MACH_U8500
        bool "U8500 Development platform"
        depends on UX500_SOC_DB8500
        select TPS6105X
+       select SOC_BUS
        help
          Include support for the mop500 development platform.
 
@@ -49,6 +50,12 @@ config MACH_U5500
        depends on UX500_SOC_DB5500
        help
          Include support for the U5500 development platform.
+
+config MACH_UX500_DT
+       bool "Generic U8500 support using device tree"
+       depends on MACH_U8500
+       select USE_OF
+
 endmenu
 
 config UX500_DEBUG_UART