[MIPS] Alchemy: Au1210/Au1250 CPU support

This patch adds IDs for new Au1200 variants: Au1210 and Au1250.
They are essentially identical to the Au1200 except for the Au1210
which has a different SoC-ID in the PRId register [bits 31:24].
The Au1250 is a "Au1200 V0.2".

Signed-off-by: Manuel Lauss <mano@roarinelk.homelinux.net>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

3 files changed, 13 insertions, 0 deletions

diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 5c2794391bf..5861a432a52 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -188,6 +188,8 @@ static inline void check_wait(void)
         case CPU_AU1500:
         case CPU_AU1550:
         case CPU_AU1200:
+        case CPU_AU1210:
+        case CPU_AU1250:
                 if (allow_au1k_wait)
                         cpu_wait = au1k_wait;
                 break;
@@ -733,6 +735,11 @@ static inline void cpu_probe_alchemy(struct cpuinfo_mips *c)
                         break;
                 case 4:
                         c->cputype = CPU_AU1200;
+                        if (2 == (c->processor_id & 0xff))
+                                c->cputype = CPU_AU1250;
+                        break;
+                case 5:
+                        c->cputype = CPU_AU1210;
                         break;
                 default:
                         panic("Unknown Au Core!");
@@ -858,6 +865,8 @@ static __init const char *cpu_to_name(struct cpuinfo_mips *c)
         case CPU_AU1100:        name = "Au1100"; break;
         case CPU_AU1550:        name = "Au1550"; break;
         case CPU_AU1200:        name = "Au1200"; break;
+        case CPU_AU1210:        name = "Au1210"; break;
+        case CPU_AU1250:        name = "Au1250"; break;
         case CPU_4KEC:          name = "MIPS 4KEc"; break;
         case CPU_4KSC:          name = "MIPS 4KSc"; break;
         case CPU_VR41XX:        name = "NEC Vr41xx"; break;
diff --git a/arch/mips/mm/c-r4k.c b/arch/mips/mm/c-r4k.c
index 06074948450..02bd180f0e0 100644
--- a/arch/mips/mm/c-r4k.c
+++ b/arch/mips/mm/c-r4k.c
@@ -980,6 +980,8 @@ static void __init probe_pcache(void)
         case CPU_AU1100:
         case CPU_AU1550:
         case CPU_AU1200:
+        case CPU_AU1210:
+        case CPU_AU1250:
                 c->icache.flags |= MIPS_CACHE_IC_F_DC;
                 break;
         }
diff --git a/arch/mips/mm/tlbex.c b/arch/mips/mm/tlbex.c
index c298344fcb7..d026302e0ec 100644
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -917,6 +917,8 @@ static void __init build_tlb_write_entry(u32 **p, struct label **l,
         case CPU_AU1500:
         case CPU_AU1550:
         case CPU_AU1200:
+        case CPU_AU1210:
+        case CPU_AU1250:
         case CPU_PR4450:
                 i_nop(p);
                 tlbw(p);