projects / GitHub / LineageOS / android_kernel_samsung_universal7580.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 9db95cb)
[ARM] pxa: update cpu_is_xsc3() to include Marvell CPUID
authorHaojian Zhuang <haojian.zhuang@marvell.com>
Fri, 21 Aug 2009 08:10:41 +0000 (16:10 +0800)
committerEric Miao <eric.y.miao@gmail.com>
Thu, 10 Sep 2009 10:49:25 +0000 (18:49 +0800)
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>
arch/arm/include/asm/cputype.h patch | blob | blame | history

diff --git a/arch/arm/include/asm/cputype.h b/arch/arm/include/asm/cputype.h
index b3e656c6fb78e20fb58fb2d361e4a2b968bfe8b7..7c6e208a7de71dad8019a7ef777c982666f1aa30 100644 (file)
--- 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;