Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 02226a20 authored by Richard Zhao's avatar Richard Zhao Committed by Sascha Hauer
Browse files

arm: mx5: mx51/53 have different mxc_cpu_type definition 



Signed-off-by: default avatarRichard Zhao <richard.zhao@freescale.com>
Acked-by: default avatarUwe Kleine-König <u.kleine-koenig@pengutronix.de>
Signed-off-by: default avatarSascha Hauer <s.hauer@pengutronix.de>
parent dca3abf8

arch/arm/plat-mxc/include/mach/mxc.h

+13 −2
Original line number Diff line number Diff line
@@ -126,7 +126,7 @@ extern unsigned int __mxc_cpu_type; 
# define cpu_is_mx35()		(0)

#endif



#ifdef CONFIG_ARCH_MX5

#ifdef CONFIG_ARCH_MX51

# ifdef mxc_cpu_type

#  undef 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

# endif

# define cpu_is_mx51()		(mxc_cpu_type == MXC_CPU_MX51)

# define cpu_is_mx53()		(mxc_cpu_type == MXC_CPU_MX53)

#else

# define cpu_is_mx51()		(0)

#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 mxc_cpu_type

#  undef mxc_cpu_type