5 files changed, 12 insertions, 6 deletions

diff --git a/arch/parisc/kernel/hardware.c b/arch/parisc/kernel/hardware.c
index 18ba4cb9159b..e365f0311881 100644
--- a/arch/parisc/kernel/hardware.c
+++ b/arch/parisc/kernel/hardware.c
@@ -1296,6 +1296,7 @@ static struct hp_cpu_type_mask {
         { 0x05f0, 0x0ff0, pcxw2  },  /* 0x05f0 - 0x05ff */
         { 0x0600, 0x0fe0, pcxl   },  /* 0x0600 - 0x061f */
         { 0x0880, 0x0ff0, mako   },  /* 0x0880 - 0x088f */
+        { 0x0890, 0x0ff0, mako2  },  /* 0x0890 - 0x089f */
         { 0x0000, 0x0000, pcx    }      /* terminate table */
 };
 
@@ -1311,7 +1312,8 @@ char *cpu_name_version[][2] = {
         [pcxw]  = { "PA8500 (PCX-W)",   "2.0" },
         [pcxw_] = { "PA8600 (PCX-W+)",  "2.0" },
         [pcxw2] = { "PA8700 (PCX-W2)",  "2.0" },
-        [mako]  = { "PA8800 (Mako)",    "2.0" }
+        [mako]  = { "PA8800 (Mako)",    "2.0" },
+        [mako2] = { "PA8900 (Shortfin)",        "2.0" }
 };
 
 const char * __init
diff --git a/arch/parisc/kernel/perf.c b/arch/parisc/kernel/perf.c
index a46bc62b643e..08717380e025 100644
--- a/arch/parisc/kernel/perf.c
+++ b/arch/parisc/kernel/perf.c
@@ -511,10 +511,12 @@ static int __init perf_init(void)
         } else if (boot_cpu_data.cpu_type == pcxw ||
                  boot_cpu_data.cpu_type == pcxw_ ||
                  boot_cpu_data.cpu_type == pcxw2 ||
-                 boot_cpu_data.cpu_type == mako) {
+                 boot_cpu_data.cpu_type == mako ||
+                 boot_cpu_data.cpu_type == mako2) {
                 perf_processor_interface = CUDA_INTF;
                 if (boot_cpu_data.cpu_type == pcxw2 ||
-                    boot_cpu_data.cpu_type == mako) 
+                    boot_cpu_data.cpu_type == mako ||
+                    boot_cpu_data.cpu_type == mako2)
                         bitmask_array = perf_bitmasks_piranha;
         } else {
                 perf_processor_interface = UNKNOWN_INTF;
diff --git a/arch/parisc/kernel/setup.c b/arch/parisc/kernel/setup.c
index b5703485088b..b34882cd71fb 100644
--- a/arch/parisc/kernel/setup.c
+++ b/arch/parisc/kernel/setup.c
@@ -225,6 +225,7 @@ static void __init parisc_proc_mkdir(void)
                 }
                 break;
         case mako:
+        case mako2:
                 if (NULL == proc_mckinley_root)
                 {
                         proc_mckinley_root = proc_mkdir("bus/mckinley", NULL);
diff --git a/include/asm-parisc/hardware.h b/include/asm-parisc/hardware.h
index 76d880dc4bae..daf58dd4ea07 100644
--- a/include/asm-parisc/hardware.h
+++ b/include/asm-parisc/hardware.h
@@ -31,7 +31,8 @@ enum cpu_type {
         pcxw    = 8, /* pa8500          pa 2.0  */
         pcxw_   = 9, /* pa8600  (w+)    pa 2.0  */
         pcxw2   = 10, /* pa8700         pa 2.0  */
-        mako    = 11  /* pa8800         pa 2.0  */
+        mako    = 11, /* pa8800         pa 2.0  */
+        mako2   = 12  /* pa8900         pa 2.0  */
 };
 
 extern char *cpu_name_version[][2]; /* mapping from enum cpu_type to strings */
diff --git a/include/asm-parisc/processor.h b/include/asm-parisc/processor.h
index d2f396721d3e..0052dc926d91 100644
--- a/include/asm-parisc/processor.h
+++ b/include/asm-parisc/processor.h
@@ -334,8 +334,8 @@ extern unsigned long get_wchan(struct task_struct *p);
 static inline int parisc_requires_coherency(void)
 {
 #ifdef CONFIG_PA8X00
-        /* FIXME: also pa8900 - when we see one */
-        return boot_cpu_data.cpu_type == mako;
+        return (boot_cpu_data.cpu_type == mako) ||
+                (boot_cpu_data.cpu_type == mako2);
 #else
         return 0;
 #endif