From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Fri, 21 Aug 2009 08:10:41 +0000 (+0800)
Subject: [ARM] pxa: update cpu_is_xsc3() to include Marvell CPUID
X-Git-Tag: v2.6.32-rc1~49^2~9^2~53
X-Git-Url: https://asedeno.scripts.mit.edu/gitweb/?a=commitdiff_plain;h=337c1db645bce3f5a832129c4a803dc157ac7e9a;p=linux.git

[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>
---

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)
 #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;