From: Shawn Guo Date: Mon, 19 May 2014 05:37:50 +0000 (+0800) Subject: ARM: imx5: move SOC_IMX5 and SOC_IMX51 into 'Device tree only' X-Git-Tag: firefly_0821_release~176^2~3447^2~22^2~62 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=50e177cae2b40c26ce956074dcd2d7384437e27e;p=firefly-linux-kernel-4.4.55.git 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 --- 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