openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

arm: mx5: mx51/53 have different mxc_cpu_type definition 

Signed-off-by: Richard Zhao <richard.zhao@freescale.com>
Acked-by: Uwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
This commit is contained in:
Richard Zhao 2010-12-30 19:25:03 +08:00 committed by Sascha Hauer
parent dca3abf8d0
commit 02226a20bc
1 changed files with 13 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
arch/arm/plat-mxc/include/mach/mxc.h
View File

@ -126,7 +126,7 @@ extern unsigned int __mxc_cpu_type;
# define cpu_is_mx35() (0) # define cpu_is_mx35() (0)
#endif #endif
#ifdef CONFIG_ARCH_MX5 #ifdef CONFIG_ARCH_MX51
# ifdef mxc_cpu_type # ifdef mxc_cpu_type
# undef mxc_cpu_type # undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type # define mxc_cpu_type __mxc_cpu_type
@ -134,11 +134,22 @@ extern unsigned int __mxc_cpu_type;
# define mxc_cpu_type MXC_CPU_MX51 # define mxc_cpu_type MXC_CPU_MX51
# endif # endif
# define cpu_is_mx51() (mxc_cpu_type == MXC_CPU_MX51) # define cpu_is_mx51() (mxc_cpu_type == MXC_CPU_MX51)
# define cpu_is_mx53() (mxc_cpu_type == MXC_CPU_MX53)
#else #else
# define cpu_is_mx51() (0) # define cpu_is_mx51() (0)
#endif #endif
#ifdef CONFIG_ARCH_MX53
# ifdef mxc_cpu_type
# undef mxc_cpu_type
# define mxc_cpu_type __mxc_cpu_type
# else
# define mxc_cpu_type MXC_CPU_MX53
# endif
# define cpu_is_mx53() (mxc_cpu_type == MXC_CPU_MX53)
#else
# define cpu_is_mx53() (0)
#endif
#ifdef CONFIG_ARCH_MXC91231 #ifdef CONFIG_ARCH_MXC91231
# ifdef mxc_cpu_type # ifdef mxc_cpu_type
# undef mxc_cpu_type # undef mxc_cpu_type