Add code to detect Au1300 and its variants. c0_prid uses a layout
different from previous Alchemy chips and company ID switched to RMI.
Core and cache-wise it is compatible with previous Alchemy chips.
Signed-off-by: Manuel Lauss <mano@xxxxxxxxxxxxxxxxxxxxxxx>
---
This patch depends on "Alchemy: remove superfluous cpu-model constants."
Information was pieced together from the Au1300 databook, and obviously
only compile tested. (Also, the irq controller looks completely different
so this patch alone is insufficient to get linux working on it).
arch/mips/include/asm/cpu.h | 1 +
arch/mips/kernel/cpu-probe.c | 39 +++++++++++++++++++++++++++++++++++++++
2 files changed, 40 insertions(+), 0 deletions(-)
diff --git a/arch/mips/include/asm/cpu.h b/arch/mips/include/asm/cpu.h
index 3bdc0e3..8dd3038 100644
--- a/arch/mips/include/asm/cpu.h
+++ b/arch/mips/include/asm/cpu.h
@@ -33,6 +33,7 @@
#define PRID_COMP_TOSHIBA 0x070000
#define PRID_COMP_LSI 0x080000
#define PRID_COMP_LEXRA 0x0b0000
+#define PRID_COMP_RMI 0x0c0000
#define PRID_COMP_CAVIUM 0x0d0000
diff --git a/arch/mips/kernel/cpu-probe.c b/arch/mips/kernel/cpu-probe.c
index 0f33858..9499610 100644
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -19,6 +19,7 @@
#include <asm/bugs.h>
#include <asm/cpu.h>
#include <asm/fpu.h>
+#include <asm/io.h>
#include <asm/mipsregs.h>
#include <asm/system.h>
#include <asm/watch.h>
@@ -886,6 +887,41 @@ static inline void cpu_probe_cavium(struct cpuinfo_mips *c, unsigned int cpu)
}
}
+static inline void cpu_probe_rmi(struct cpuinfo_mips *c, unsigned int cpu)
+{
+ decode_configs(c);
+ switch (c->processor_id & 0xff000000) {
+ case 0x80000000: /* Au1300 */
+ c->cputype = CPU_ALCHEMY;
+
+ /* OTP-ROM Config0 register indicates the presence
+ * of various peripherals. Combinations of those
+ * bits are marketed unter different names.
+ */
+ switch (__raw_readl((void *)0xb0002000)) {
+ case 0x00000000:
+ __cpu_name[cpu] = "Au1380";
+ break;
+ case 0x0000000d:
+ __cpu_name[cpu] = "Au1370";
+ break;
+ case 0x00000010:
+ __cpu_name[cpu] = "Au1350";
+ break;
+ case 0x0000001d:
+ __cpu_name[cpu] = "Au1340";
+ break;
+ default:
+ __cpu_name[cpu] = "Au1300";
+ break;
+ }
+ default:
+ printk(KERN_INFO "Unknown RMI chip!\n");
+ c->cputype = CPU_UNKNOWN;
+ break;
+ }
+}
+
const char *__cpu_name[NR_CPUS];
__cpuinit void cpu_probe(void)
@@ -920,6 +956,9 @@ __cpuinit void cpu_probe(void)
case PRID_COMP_NXP:
cpu_probe_nxp(c, cpu);
break;
+ case PRID_COMP_RMI:
+ cpu_probe_rmi(c, cpu);
+ break;
case PRID_COMP_CAVIUM:
cpu_probe_cavium(c, cpu);
break;
--
1.6.1
