diff options
author | Haojian Zhuang <haojian.zhuang@gmail.com> | 2009-11-04 21:58:16 -0500 |
---|---|---|
committer | Eric Miao <eric.y.miao@gmail.com> | 2009-11-30 20:02:59 -0500 |
commit | 61333c63005e5708977e309da32c952057ee445b (patch) | |
tree | a100ddafeb299e3807b36dc1a33f05d90adb745a /arch | |
parent | bf293aec15fb223fd81c0cdfd1829edff95a325b (diff) |
[ARM] pxa: rename macro from pxa9xx to pxa93x
Because original macro can only judge whether current CPU is pxa93x,
rename the macro to correct name.
Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com>
Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch')
-rw-r--r-- | arch/arm/mach-pxa/include/mach/hardware.h | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/arch/arm/mach-pxa/include/mach/hardware.h b/arch/arm/mach-pxa/include/mach/hardware.h index aa3d9f70a08a..50f1297bf5ac 100644 --- a/arch/arm/mach-pxa/include/mach/hardware.h +++ b/arch/arm/mach-pxa/include/mach/hardware.h | |||
@@ -105,6 +105,7 @@ | |||
105 | * | 105 | * |
106 | * PXA935 A0 0x56056931 0x1E653013 | 106 | * PXA935 A0 0x56056931 0x1E653013 |
107 | * PXA935 B0 0x56056936 0x6E653013 | 107 | * PXA935 B0 0x56056936 0x6E653013 |
108 | * PXA935 B1 0x56056938 0x8E653013 | ||
108 | */ | 109 | */ |
109 | #ifdef CONFIG_PXA25x | 110 | #ifdef CONFIG_PXA25x |
110 | #define __cpu_is_pxa210(id) \ | 111 | #define __cpu_is_pxa210(id) \ |
@@ -283,7 +284,7 @@ | |||
283 | _id == 0x3; \ | 284 | _id == 0x3; \ |
284 | }) | 285 | }) |
285 | 286 | ||
286 | #define __cpu_is_pxa9xx(id) \ | 287 | #define __cpu_is_pxa93x(id) \ |
287 | ({ \ | 288 | ({ \ |
288 | unsigned int _id = (id) >> 4 & 0xfff; \ | 289 | unsigned int _id = (id) >> 4 & 0xfff; \ |
289 | _id == 0x683 || _id == 0x693; \ | 290 | _id == 0x683 || _id == 0x693; \ |
@@ -299,9 +300,9 @@ | |||
299 | __cpu_is_pxa3xx(read_cpuid_id()); \ | 300 | __cpu_is_pxa3xx(read_cpuid_id()); \ |
300 | }) | 301 | }) |
301 | 302 | ||
302 | #define cpu_is_pxa9xx() \ | 303 | #define cpu_is_pxa93x() \ |
303 | ({ \ | 304 | ({ \ |
304 | __cpu_is_pxa9xx(read_cpuid_id()); \ | 305 | __cpu_is_pxa93x(read_cpuid_id()); \ |
305 | }) | 306 | }) |
306 | /* | 307 | /* |
307 | * return current memory and LCD clock frequency in units of 10kHz | 308 | * return current memory and LCD clock frequency in units of 10kHz |