summaryrefslogtreecommitdiff
path: root/arch/arm/mach-pxa/time.c
diff options
context:
space:
mode:
authorEric Miao <eric.miao@marvell.com>2008-09-11 06:27:30 +0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2008-09-25 12:54:55 +0400
commit0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e (patch)
tree46890e5788964978c5ab0ea915decf8dbd772929 /arch/arm/mach-pxa/time.c
parent2b12797c59d60379858050255046dacfbee68a8b (diff)
downloadlinux-0ffcbfd54ea81ca24c0749f55ca4fcf3e2bdc23e.tar.xz
[ARM] pxa: make cpu_is_pxa2* macros more consistent
1. add a CPUID table in the comment 2. make cpu_is_pxa25x() true for PXA210/250/255/26x 3. PXA210 is treated as PXA25x, all related code modified to reflect this Signed-off-by: Eric Miao <eric.miao@marvell.com> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-pxa/time.c')
-rw-r--r--arch/arm/mach-pxa/time.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/arch/arm/mach-pxa/time.c b/arch/arm/mach-pxa/time.c
index 67e18509d7bf..18d149745837 100644
--- a/arch/arm/mach-pxa/time.c
+++ b/arch/arm/mach-pxa/time.c
@@ -155,7 +155,7 @@ static void __init pxa_timer_init(void)
OIER = 0;
OSSR = OSSR_M0 | OSSR_M1 | OSSR_M2 | OSSR_M3;
- if (cpu_is_pxa21x() || cpu_is_pxa25x())
+ if (cpu_is_pxa25x())
clock_tick_rate = 3686400;
else if (machine_is_mainstone())
clock_tick_rate = 3249600;