From 093e7f36ceaaeb6569e925d873d369b812c52564 Mon Sep 17 00:00:00 2001 From: Shawn Guo Date: Mon, 19 May 2014 13:37:50 +0800 Subject: [PATCH] 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 --- arch/arm/mach-imx/Kconfig | 25 ++++++++++++------------- 1 file changed, 12 insertions(+), 13 deletions(-) diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig index 509048675256..ce9361409655 100644 --- a/arch/arm/mach-imx/Kconfig +++ b/arch/arm/mach-imx/Kconfig @@ -122,19 +122,6 @@ config SOC_IMX35 select PINCTRL_IMX35 select SMP_ON_UP if SMP -config SOC_IMX5 - bool - select ARCH_HAS_CPUFREQ - 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:" @@ -704,6 +691,18 @@ if ARCH_MULTI_V7 comment "Device tree only" +config SOC_IMX5 + bool + select ARCH_HAS_CPUFREQ + 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 -- 2.39.5