1 files changed, 25 insertions, 16 deletions

diff --git a/arch/powerpc/kernel/cputable.c b/arch/powerpc/kernel/cputable.c
index b1f8000952f3..8eb8087383eb 100644
--- a/arch/powerpc/kernel/cputable.c
+++ b/arch/powerpc/kernel/cputable.c
@@ -68,15 +68,6 @@ extern void __restore_cpu_ppc970(void);
 #define COMMON_USER_BOOKE       (PPC_FEATURE_32 | PPC_FEATURE_HAS_MMU | \
                                  PPC_FEATURE_BOOKE)
 
-/* We only set the spe features if the kernel was compiled with
- * spe support
- */
-#ifdef CONFIG_SPE
-#define PPC_FEATURE_SPE_COMP    PPC_FEATURE_HAS_SPE
-#else
-#define PPC_FEATURE_SPE_COMP    0
-#endif
-
 static struct cpu_spec cpu_specs[] = {
 #ifdef CONFIG_PPC64
         {       /* Power3 */
@@ -1132,6 +1123,24 @@ static struct cpu_spec cpu_specs[] = {
                 .dcache_bsize           = 32,
                 .platform               = "ppc440",
         },
+        { /* 440EPX */
+                .pvr_mask               = 0xf0000ffb,
+                .pvr_value              = 0x200008D0,
+                .cpu_name               = "440EPX",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE | PPC_FEATURE_HAS_FPU,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+        },
+        { /* 440GRX */
+                .pvr_mask               = 0xf0000ffb,
+                .pvr_value              = 0x200008D8,
+                .cpu_name               = "440GRX",
+                .cpu_features           = CPU_FTRS_44X,
+                .cpu_user_features      = COMMON_USER_BOOKE,
+                .icache_bsize           = 32,
+                .dcache_bsize           = 32,
+        },
         {       /* 440GP Rev. B */
                 .pvr_mask               = 0xf0000fff,
                 .pvr_value              = 0x40000440,
@@ -1243,8 +1252,8 @@ static struct cpu_spec cpu_specs[] = {
                 /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E200,
                 .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_SPE_COMP |
-                        PPC_FEATURE_HAS_EFP_SINGLE |
+                        PPC_FEATURE_HAS_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE_COMP |
                         PPC_FEATURE_UNIFIED_CACHE,
                 .dcache_bsize           = 32,
                 .platform               = "ppc5554",
@@ -1256,8 +1265,8 @@ static struct cpu_spec cpu_specs[] = {
                 /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E500,
                 .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_SPE_COMP |
-                        PPC_FEATURE_HAS_EFP_SINGLE,
+                        PPC_FEATURE_HAS_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE_COMP,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,
@@ -1272,9 +1281,9 @@ static struct cpu_spec cpu_specs[] = {
                 /* xxx - galak: add CPU_FTR_MAYBE_CAN_DOZE */
                 .cpu_features           = CPU_FTRS_E500_2,
                 .cpu_user_features      = COMMON_USER_BOOKE |
-                        PPC_FEATURE_SPE_COMP |
-                        PPC_FEATURE_HAS_EFP_SINGLE |
-                        PPC_FEATURE_HAS_EFP_DOUBLE,
+                        PPC_FEATURE_HAS_SPE_COMP |
+                        PPC_FEATURE_HAS_EFP_SINGLE_COMP |
+                        PPC_FEATURE_HAS_EFP_DOUBLE_COMP,
                 .icache_bsize           = 32,
                 .dcache_bsize           = 32,
                 .num_pmcs               = 4,