From e3aa3371ac8d78d74578629ae23f365ecd00b24f Mon Sep 17 00:00:00 2001
From: "Grant C. Likely" <grant.likely@secretlab.ca>
Date: Thu, 19 Jan 2006 01:13:20 -0700
Subject: [PATCH] --- yaml --- r: 22897 b: refs/heads/master c:
 72646c7f69acad3595cc69f82a6e664a23b05542 h: refs/heads/master i:   22895:
 bd70a7a80d3cfb82e9e236066abc36a3abcabb6d v: v3

---
 [refs]                               |  2 +-
 trunk/arch/powerpc/kernel/cputable.c | 12 +++++++++++-
 2 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/[refs] b/[refs]
index c3d8d67982d7..05e838028c71 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 5eb446cb72f67fdb87b2a1dd16262b75edbe30bc
+refs/heads/master: 72646c7f69acad3595cc69f82a6e664a23b05542
diff --git a/trunk/arch/powerpc/kernel/cputable.c b/trunk/arch/powerpc/kernel/cputable.c
index 10696456a4c6..3191be7135fe 100644
--- a/trunk/arch/powerpc/kernel/cputable.c
+++ b/trunk/arch/powerpc/kernel/cputable.c
@@ -891,7 +891,7 @@ struct cpu_spec	cpu_specs[] = {
 		.platform		= "ppc405",
 	},
 	{	/* Xilinx Virtex-II Pro  */
-		.pvr_mask		= 0xffff0000,
+		.pvr_mask		= 0xfffff000,
 		.pvr_value		= 0x20010000,
 		.cpu_name		= "Virtex-II Pro",
 		.cpu_features		= CPU_FTRS_40X,
@@ -901,6 +901,16 @@ struct cpu_spec	cpu_specs[] = {
 		.dcache_bsize		= 32,
 		.platform		= "ppc405",
 	},
+	{	/* Xilinx Virtex-4 FX */
+		.pvr_mask		= 0xfffff000,
+		.pvr_value		= 0x20011000,
+		.cpu_name		= "Virtex-4 FX",
+		.cpu_features		= CPU_FTRS_40X,
+		.cpu_user_features	= PPC_FEATURE_32 |
+			PPC_FEATURE_HAS_MMU | PPC_FEATURE_HAS_4xxMAC,
+		.icache_bsize		= 32,
+		.dcache_bsize		= 32,
+	},
 	{	/* 405EP */
 		.pvr_mask		= 0xffff0000,
 		.pvr_value		= 0x51210000,