summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@freescale.com>2014-05-19 13:37:50 +0800
committerShawn Guo <shawn.guo@freescale.com>2014-07-18 16:10:04 +0800
commit50e177cae2b40c26ce956074dcd2d7384437e27e (patch)
tree2326bc5acfe490228a9103690124f577fa44028a
parent641dfe8b73e81aa38cbbeab72a480462a4987963 (diff)
ARM: imx5: move SOC_IMX5 and SOC_IMX51 into 'Device tree only'
After moving SOC_IMX51 support over to device tree, all i.MX5 support becomes device tree only now. So options SOC_IMX5 and SOC_IMX51 can just be under 'Device tree only'. While at it, 'select ARCH_MXC_IOMUX_V3' is dropped, since it's only needed by non-DT build before. Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
-rw-r--r--arch/arm/mach-imx/Kconfig23
1 files changed, 11 insertions, 12 deletions
diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index a4da79c6c5a8..061c168068a8 100644
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@ -119,18 +119,6 @@ config SOC_IMX35
select PINCTRL_IMX35
select SMP_ON_UP if SMP
-config SOC_IMX5
- bool
- select ARCH_HAS_OPP
- select ARCH_MXC_IOMUX_V3
- select HAVE_IMX_SRC
- select MXC_TZIC
-
-config SOC_IMX51
- bool
- select PINCTRL_IMX51
- select SOC_IMX5
-
if ARCH_MULTI_V4T
comment "MX1 platforms:"
@@ -700,6 +688,17 @@ if ARCH_MULTI_V7
comment "Device tree only"
+config SOC_IMX5
+ bool
+ select ARCH_HAS_OPP
+ select HAVE_IMX_SRC
+ select MXC_TZIC
+
+config SOC_IMX51
+ bool
+ select PINCTRL_IMX51
+ select SOC_IMX5
+
config SOC_IMX50
bool "i.MX50 support"
select PINCTRL_IMX50