]> git.proxmox.com Git - mirror_ubuntu-focal-kernel.git/commitdiff
ARM: imx5: move SOC_IMX5 and SOC_IMX51 into 'Device tree only'
authorShawn Guo <shawn.guo@freescale.com>
Mon, 19 May 2014 05:37:50 +0000 (13:37 +0800)
committerShawn Guo <shawn.guo@freescale.com>
Fri, 18 Jul 2014 08:10:04 +0000 (16:10 +0800)
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>
arch/arm/mach-imx/Kconfig

index a4da79c6c5a83e5cf8ee8c5146db57dfd1b591be..061c168068a8fbcd5763352aad073e643c3076c4 100644 (file)
@@ -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