ARM: mxs: always build in device tree support

As the ultimate for mxs platform is to convert over to device tree,
let's start always building in device tree support for the platform.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Marek Vasut <marex@denx.de>

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index ae5c251cd251994a5236d998651826d6b656dfd0..1f1a4fa6db5851b1d811cdd6c48c6048d4b6e36f 100644 (file)
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -471,6 +471,7 @@ config ARCH_MXS
        select COMMON_CLK
        select HAVE_CLK_PREPARE
        select PINCTRL
+       select USE_OF
        help
          Support for Freescale MXS-based family of processors
 

diff --git a/arch/arm/configs/mxs_defconfig b/arch/arm/configs/mxs_defconfig
index 1ebbf451c48d39076446dd84406e00fb5fcb9b6e..5406c23a02e3b2dafa323300222690094f38326d 100644 (file)
--- a/arch/arm/configs/mxs_defconfig
+++ b/arch/arm/configs/mxs_defconfig
@@ -22,6 +22,7 @@ CONFIG_BLK_DEV_INTEGRITY=y
 # CONFIG_IOSCHED_DEADLINE is not set
 # CONFIG_IOSCHED_CFQ is not set
 CONFIG_ARCH_MXS=y
+CONFIG_MACH_MXS_DT=y
 CONFIG_MACH_MX23EVK=y
 CONFIG_MACH_MX28EVK=y
 CONFIG_MACH_STMP378X_DEVB=y

diff --git a/arch/arm/mach-mxs/Kconfig b/arch/arm/mach-mxs/Kconfig
index 8138a13e23cf5be8cd6dca0d97618aa155dcec33..91cf0625819c2f62639cff7216e6563b9813e585 100644 (file)
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -25,7 +25,6 @@ config MACH_MXS_DT
        bool "Support MXS platforms from device tree"
        select SOC_IMX23
        select SOC_IMX28
-       select USE_OF
        help
          Include support for Freescale MXS platforms(i.MX23 and i.MX28)
          using the device tree for discovery