Explorar o código

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>
Richard Zhao %!s(int64=14) %!d(string=hai) anos
pai
achega
02226a20bc
Modificáronse 1 ficheiros con 13 adicións e 2 borrados
  1. 13 2
      arch/arm/plat-mxc/include/mach/mxc.h

+ 13 - 2
arch/arm/plat-mxc/include/mach/mxc.h

@@ -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