[PATCH 1/5] ARM i.MX: move cpu_type macros in front of cpu_revision code

[Sascha Hauer]

On Mon, Jan 30, 2017 at 11:50:55PM +0100, Alexander Kurz wrote:
> Preparational commit to enable the use of cpu_type macros in imx6_cpu_revision()
> 
> Signed-off-by: Alexander Kurz <akurz at blala.de>

Applied patches 1-4 for now.

Sascha

> ---
>  arch/arm/mach-imx/include/mach/imx6.h | 40 +++++++++++++++++------------------
>  1 file changed, 20 insertions(+), 20 deletions(-)
> 
> diff --git a/arch/arm/mach-imx/include/mach/imx6.h b/arch/arm/mach-imx/include/mach/imx6.h
> index 8c169f1..e201721 100644
> --- a/arch/arm/mach-imx/include/mach/imx6.h
> +++ b/arch/arm/mach-imx/include/mach/imx6.h
> @@ -50,6 +50,26 @@ static inline int imx6_cpu_type(void)
>  	return __imx6_cpu_type();
>  }
>  
> +#define DEFINE_MX6_CPU_TYPE(str, type)					\
> +	static inline int cpu_mx6_is_##str(void)			\
> +	{								\
> +		return __imx6_cpu_type() == type;			\
> +	}								\
> +									\
> +	static inline int cpu_is_##str(void)				\
> +	{								\
> +		if (!cpu_is_mx6())					\
> +			return 0;					\
> +		return cpu_mx6_is_##str();				\
> +	}
> +
> +DEFINE_MX6_CPU_TYPE(mx6s, IMX6_CPUTYPE_IMX6S);
> +DEFINE_MX6_CPU_TYPE(mx6dl, IMX6_CPUTYPE_IMX6DL);
> +DEFINE_MX6_CPU_TYPE(mx6q, IMX6_CPUTYPE_IMX6Q);
> +DEFINE_MX6_CPU_TYPE(mx6d, IMX6_CPUTYPE_IMX6D);
> +DEFINE_MX6_CPU_TYPE(mx6sx, IMX6_CPUTYPE_IMX6SX);
> +DEFINE_MX6_CPU_TYPE(mx6ul, IMX6_CPUTYPE_IMX6UL);
> +
>  static inline int __imx6_cpu_revision(void)
>  {
>  
> @@ -85,24 +105,4 @@ static inline int imx6_cpu_revision(void)
>  	return __imx6_cpu_revision();
>  }
>  
> -#define DEFINE_MX6_CPU_TYPE(str, type)					\
> -	static inline int cpu_mx6_is_##str(void)			\
> -	{								\
> -		return __imx6_cpu_type() == type;			\
> -	}								\
> -									\
> -	static inline int cpu_is_##str(void)				\
> -	{								\
> -		if (!cpu_is_mx6())					\
> -			return 0;					\
> -		return cpu_mx6_is_##str();				\
> -	}
> -
> -DEFINE_MX6_CPU_TYPE(mx6s, IMX6_CPUTYPE_IMX6S);
> -DEFINE_MX6_CPU_TYPE(mx6dl, IMX6_CPUTYPE_IMX6DL);
> -DEFINE_MX6_CPU_TYPE(mx6q, IMX6_CPUTYPE_IMX6Q);
> -DEFINE_MX6_CPU_TYPE(mx6d, IMX6_CPUTYPE_IMX6D);
> -DEFINE_MX6_CPU_TYPE(mx6sx, IMX6_CPUTYPE_IMX6SX);
> -DEFINE_MX6_CPU_TYPE(mx6ul, IMX6_CPUTYPE_IMX6UL);
> -
>  #endif /* __MACH_IMX6_H */
> -- 
> 2.1.4
> 
> 
> _______________________________________________
> barebox mailing list
> barebox at lists.infradead.org
> http://lists.infradead.org/mailman/listinfo/barebox
> 

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |