diff mbox

[1/4] ARM: imx: move SOC_IMX5 and SOC_IMX51 into 'Device tree only'

Message ID 1400482606-8278-2-git-send-email-shawn.guo@freescale.com
State New
Headers show

Commit Message

Shawn Guo May 19, 2014, 6:56 a.m. UTC
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'.

Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
---
 arch/arm/mach-imx/Kconfig | 26 +++++++++++++-------------
 1 file changed, 13 insertions(+), 13 deletions(-)

Comments

Alexander Shiyan May 19, 2014, 7:06 a.m. UTC | #1
Mon, 19 May 2014 14:56:43 +0800 от Shawn Guo <shawn.guo@freescale.com>:
> 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'.
> 
> Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
> ---
>  arch/arm/mach-imx/Kconfig | 26 +++++++++++++-------------
>  1 file changed, 13 insertions(+), 13 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
> index a6ee115..19c609e 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,19 @@ if ARCH_MULTI_V7
>  
>  comment "Device tree only"
>  
> +config SOC_IMX5
> +	bool
> +	select ARCH_HAS_CPUFREQ
> +	select ARCH_HAS_OPP
> +	select ARCH_MXC_IOMUX_V3

We can drop ARCH_MXC_IOMUX_V3 now.

---
Shawn Guo May 19, 2014, 7:13 a.m. UTC | #2
On Mon, May 19, 2014 at 11:06:35AM +0400, Alexander Shiyan wrote:
> > @@ -704,6 +691,19 @@ if ARCH_MULTI_V7
> >  
> >  comment "Device tree only"
> >  
> > +config SOC_IMX5
> > +	bool
> > +	select ARCH_HAS_CPUFREQ
> > +	select ARCH_HAS_OPP
> > +	select ARCH_MXC_IOMUX_V3
> 
> We can drop ARCH_MXC_IOMUX_V3 now.

Yes, you're right.  Dropped it.  Thanks, Alexander.

Shawn
diff mbox

Patch

diff --git a/arch/arm/mach-imx/Kconfig b/arch/arm/mach-imx/Kconfig
index a6ee115..19c609e 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,19 @@  if ARCH_MULTI_V7
 
 comment "Device tree only"
 
+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
+
 config	SOC_IMX50
 	bool "i.MX50 support"
 	select PINCTRL_IMX50