Merge branch 'for-2.6.25' of master.kernel.org:/pub/scm/linux/kernel/git/jwboyer/powerpc-4xx

1 files changed, 26 insertions, 2 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index f1928af5fcfc..a4c2771b5e62 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -1178,8 +1178,8 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .platform               = "ppc405",
         },
         {       /* 405EX */
-                .pvr_mask               = 0xffff0000,
-                .pvr_value              = 0x12910000,
+                .pvr_mask               = 0xffff0004,
+                .pvr_value              = 0x12910004,
                 .cpu_name               = "405EX",
                 .cpu_features           = CPU_FTRS_40X,
                 .cpu_user_features      = PPC_FEATURE_32 |
@@ -1189,6 +1189,18 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_4xx,
                 .platform               = "ppc405",
         },
+        {       /* 405EXr */
+                .pvr_mask               = 0xffff0004,
+                .pvr_value              = 0x12910000,
+                .cpu_name               = "405EXr",
+                .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,
+                .machine_check          = machine_check_4xx,
+                .platform               = "ppc405",
+        },
 
 #endif /* CONFIG_40x */
 #ifdef CONFIG_44x
@@ -1226,6 +1238,18 @@ static struct cpu_spec __initdata cpu_specs[] = {
                 .machine_check          = machine_check_4xx,
                 .platform               = "ppc440",
         },
+        { /* Matches both physical and logical PVR for 440EP (logical pvr = pvr | 0x8) */
+                .pvr_mask               = 0xf0000ff7,
+                .pvr_value              = 0x400008d4,
+                .cpu_name               = "440EP Rev. C",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+                .cpu_setup              = __setup_cpu_440ep,
+                .machine_check          = machine_check_4xx,
+                .platform               = "ppc440",
+        },
         { /* Use logical PVR for 440EP (logical pvr = pvr | 0x8) */
                 .pvr_mask               = 0xf0000fff,
                 .pvr_value              = 0x400008db,