aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/include/asm
diff options
context:
space:
mode:
authorHaojian Zhuang <haojian.zhuang@marvell.com>2009-08-21 04:10:41 -0400
committerEric Miao <eric.y.miao@gmail.com>2009-09-10 06:49:25 -0400
commit337c1db645bce3f5a832129c4a803dc157ac7e9a (patch)
tree834f194ae258b17151f1a83062abc99e6d915591 /arch/arm/include/asm
parent9db95cb6c430b3d9b8abbd5870e0d1e69b884ba0 (diff)
[ARM] pxa: update cpu_is_xsc3() to include Marvell CPUID
CPU id is changed in Marvell chip. So update the code in cpu_is_xsc3(). Signed-off-by: Haojian Zhuang <haojian.zhuang@marvell.com> Signed-off-by: Eric Miao <eric.y.miao@gmail.com>
Diffstat (limited to 'arch/arm/include/asm')
-rw-r--r--arch/arm/include/asm/cputype.h5
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index b3e656c6fb78..7c6e208a7de7 100644
--- a/arch/arm/include/asm/cputype.h
+++ b/arch/arm/include/asm/cputype.h
@@ -73,7 +73,10 @@ static inline unsigned int __attribute_const__ read_cpuid_cachetype(void)
73#else 73#else
74static inline int cpu_is_xsc3(void) 74static inline int cpu_is_xsc3(void)
75{ 75{
76 if ((read_cpuid_id() & 0xffffe000) == 0x69056000) 76 unsigned int id;
77 id = read_cpuid_id() & 0xffffe000;
78 /* It covers both Intel ID and Marvell ID */
79 if ((id == 0x69056000) || (id == 0x56056000))
77 return 1; 80 return 1;
78 81
79 return 0; 82 return 0;