From 7cd535f0c539de98971beb96cb23b34ef0ef72f5 Mon Sep 17 00:00:00 2001
From: Haojian Zhuang <haojian.zhuang@marvell.com>
Date: Fri, 21 Aug 2009 16:10:41 +0800
Subject: [PATCH] --- yaml --- r: 166059 b: refs/heads/master c:
 337c1db645bce3f5a832129c4a803dc157ac7e9a h: refs/heads/master i:   166057:
 9845f4d61540b2f7b0bf7a598ce74aa39ebd5098   166055:
 5c2175c07c11ffcb8bd67c1d0a4f91d40f1d263b v: v3

---
 [refs]                               | 2 +-
 trunk/arch/arm/include/asm/cputype.h | 5 ++++-
 2 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index af4c1c467c93..52c6e590dd76 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 9db95cb6c430b3d9b8abbd5870e0d1e69b884ba0
+refs/heads/master: 337c1db645bce3f5a832129c4a803dc157ac7e9a
diff --git a/trunk/arch/arm/include/asm/cputype.h b/trunk/arch/arm/include/asm/cputype.h
index b3e656c6fb78..7c6e208a7de7 100644
--- a/trunk/arch/arm/include/asm/cputype.h
+++ b/trunk/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;