diff options
author | Richard Zhao <richard.zhao@freescale.com> | 2010-12-30 06:25:03 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-01-03 03:38:28 -0500 |
commit | 02226a20bcfb01322d4a168f2ed6a6e4366796fd (patch) | |
tree | c4f39b5f23fc7ab48ad62accf7326b75d204cc9b /arch/arm/plat-mxc | |
parent | dca3abf8d071cb78bac8c8f50259e9fe3a81a4bd (diff) |
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>
Diffstat (limited to 'arch/arm/plat-mxc')
-rw-r--r-- | arch/arm/plat-mxc/include/mach/mxc.h | 15 |
1 files changed, 13 insertions, 2 deletions
diff --git a/arch/arm/plat-mxc/include/mach/mxc.h b/arch/arm/plat-mxc/include/mach/mxc.h index 4abbdd11d5c6..eca8f8317551 100644 --- a/arch/arm/plat-mxc/include/mach/mxc.h +++ b/arch/arm/plat-mxc/include/mach/mxc.h | |||
@@ -126,7 +126,7 @@ extern unsigned int __mxc_cpu_type; | |||
126 | # define cpu_is_mx35() (0) | 126 | # define cpu_is_mx35() (0) |
127 | #endif | 127 | #endif |
128 | 128 | ||
129 | #ifdef CONFIG_ARCH_MX5 | 129 | #ifdef CONFIG_ARCH_MX51 |
130 | # ifdef mxc_cpu_type | 130 | # ifdef mxc_cpu_type |
131 | # undef mxc_cpu_type | 131 | # undef mxc_cpu_type |
132 | # define mxc_cpu_type __mxc_cpu_type | 132 | # define mxc_cpu_type __mxc_cpu_type |
@@ -134,11 +134,22 @@ extern unsigned int __mxc_cpu_type; | |||
134 | # define mxc_cpu_type MXC_CPU_MX51 | 134 | # define mxc_cpu_type MXC_CPU_MX51 |
135 | # endif | 135 | # endif |
136 | # define cpu_is_mx51() (mxc_cpu_type == MXC_CPU_MX51) | 136 | # define cpu_is_mx51() (mxc_cpu_type == MXC_CPU_MX51) |
137 | # define cpu_is_mx53() (mxc_cpu_type == MXC_CPU_MX53) | ||
138 | #else | 137 | #else |
139 | # define cpu_is_mx51() (0) | 138 | # define cpu_is_mx51() (0) |
140 | #endif | 139 | #endif |
141 | 140 | ||
141 | #ifdef CONFIG_ARCH_MX53 | ||
142 | # ifdef mxc_cpu_type | ||
143 | # undef mxc_cpu_type | ||
144 | # define mxc_cpu_type __mxc_cpu_type | ||
145 | # else | ||
146 | # define mxc_cpu_type MXC_CPU_MX53 | ||
147 | # endif | ||
148 | # define cpu_is_mx53() (mxc_cpu_type == MXC_CPU_MX53) | ||
149 | #else | ||
150 | # define cpu_is_mx53() (0) | ||
151 | #endif | ||
152 | |||
142 | #ifdef CONFIG_ARCH_MXC91231 | 153 | #ifdef CONFIG_ARCH_MXC91231 |
143 | # ifdef mxc_cpu_type | 154 | # ifdef mxc_cpu_type |
144 | # undef mxc_cpu_type | 155 | # undef mxc_cpu_type |