CVS Update@linux-mips.org: linux

[ralf@linux-mips.org]

CVSROOT:        /home/cvs
Module name:    linux
Changes by:     ralf@ftp.linux-mips.org 05/07/12 17:12:06

Modified files:
        arch/mips/kernel: cpu-probe.c proc.c 
        arch/mips/mm   : tlbex.c 
        include/asm-mips: cpu.h 

Log message:
        Detect the 34K.

diff -urN linux/arch/mips/kernel/cpu-probe.c linux/arch/mips/kernel/cpu-probe.c
--- linux/arch/mips/kernel/cpu-probe.c  2005/07/11 10:03:25     1.50
+++ linux/arch/mips/kernel/cpu-probe.c  2005/07/12 16:12:05     1.51
@@ -104,6 +104,7 @@
 /*     case CPU_20KC:*/
        case CPU_24K:
        case CPU_25KF:
+       case CPU_34K:
                cpu_wait = r4k_wait;
                printk(" available.\n");
                break;
@@ -544,6 +545,10 @@
                /* Probe for L2 cache */
                c->scache.flags &= ~MIPS_CACHE_NOT_PRESENT;
                break;
+       case PRID_IMP_34K:
+               c->cputype = CPU_34K;
+               c->isa_level = MIPS_CPU_ISA_M32;
+               break;
        }
 }
 
diff -urN linux/arch/mips/kernel/proc.c linux/arch/mips/kernel/proc.c
--- linux/arch/mips/kernel/proc.c       2005/05/05 16:45:59     1.57
+++ linux/arch/mips/kernel/proc.c       2005/07/12 16:12:05     1.58
@@ -72,6 +72,7 @@
        [CPU_20KC]      = "MIPS 20Kc",
        [CPU_24K]       = "MIPS 24K",
        [CPU_25KF]      = "MIPS 25Kf",
+       [CPU_34K]       = "MIPS 34K",
        [CPU_VR4111]    = "NEC VR4111",
        [CPU_VR4121]    = "NEC VR4121",
        [CPU_VR4122]    = "NEC VR4122",
diff -urN linux/arch/mips/mm/tlbex.c linux/arch/mips/mm/tlbex.c
--- linux/arch/mips/mm/tlbex.c  2005/07/11 10:03:28     1.28
+++ linux/arch/mips/mm/tlbex.c  2005/07/12 16:12:05     1.29
@@ -879,6 +879,7 @@
 
        case CPU_4KEC:
        case CPU_24K:
+       case CPU_34K:
                i_ehb(p);
                tlbw(p);
                break;
diff -urN linux/include/asm-mips/cpu.h linux/include/asm-mips/cpu.h
--- linux/include/asm-mips/cpu.h        2005/05/31 11:49:19     1.56
+++ linux/include/asm-mips/cpu.h        2005/07/12 16:12:05     1.57
@@ -77,6 +77,7 @@
 #define PRID_IMP_4KEMPR2       0x9100
 #define PRID_IMP_4KSD          0x9200
 #define PRID_IMP_24K           0x9300
+#define PRID_IMP_34K           0x9500
 #define PRID_IMP_24KE          0x9600
 
 #define PRID_IMP_UNKNOWN       0xff00
@@ -185,7 +186,8 @@
 #define CPU_AU1550             57
 #define CPU_24K                        58
 #define CPU_AU1200             59
-#define CPU_LAST               59
+#define CPU_34K                        60
+#define CPU_LAST               60
 
 /*
  * ISA Level encodings