Patchwork [2/2] ARM: mxs: always build in device tree support

login
register
mail settings
Submitter Shawn Guo
Date May 4, 2012, 1:50 p.m.
Message ID <1336139444-24672-2-git-send-email-shawn.guo@linaro.org>
Download mbox | patch
Permalink /patch/156939/
State New
Headers show

Comments

Shawn Guo - May 4, 2012, 1:50 p.m.
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>
---
 arch/arm/Kconfig               |    1 +
 arch/arm/configs/mxs_defconfig |    1 +
 arch/arm/mach-mxs/Kconfig      |    1 -
 3 files changed, 2 insertions(+), 1 deletions(-)

Patch

diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index cf006d4..1a64f6b 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -469,6 +469,7 @@  config ARCH_MXS
 	select CLKDEV_LOOKUP
 	select CLKSRC_MMIO
 	select HAVE_CLK_PREPARE
+	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 1ebbf45..5406c23 100644
--- 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 a37cfc3..a288762 100644
--- a/arch/arm/mach-mxs/Kconfig
+++ b/arch/arm/mach-mxs/Kconfig
@@ -23,7 +23,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