diff options
| author | Haojian Zhuang <haojian.zhuang@marvell.com> | 2009-08-21 16:10:41 +0800 |
|---|---|---|
| committer | Eric Miao <eric.y.miao@gmail.com> | 2009-09-10 18:49:25 +0800 |
| commit | 337c1db645bce3f5a832129c4a803dc157ac7e9a (patch) | |
| tree | 834f194ae258b17151f1a83062abc99e6d915591 /arch | |
| parent | 9db95cb6c430b3d9b8abbd5870e0d1e69b884ba0 (diff) | |
| download | op-kernel-dev-337c1db645bce3f5a832129c4a803dc157ac7e9a.zip op-kernel-dev-337c1db645bce3f5a832129c4a803dc157ac7e9a.tar.gz | |
[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')
| -rw-r--r-- | arch/arm/include/asm/cputype.h | 5 |
1 files changed, 4 insertions, 1 deletions
diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h index b3e656c..7c6e208 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) #else static inline int cpu_is_xsc3(void) { - if ((read_cpuid_id() & 0xffffe000) == 0x69056000) + unsigned int id; + id = read_cpuid_id() & 0xffffe000; + /* It covers both Intel ID and Marvell ID */ + if ((id == 0x69056000) || (id == 0x56056000)) return 1; return 0; |
