mirror of
git://projects.qi-hardware.com/openwrt-xburst.git
synced 2024-12-25 22:36:46 +02:00
5f12aa1919
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@17081 3c298f89-4303-0410-b956-a3cf2f4a3e73
96 lines
2.6 KiB
Diff
96 lines
2.6 KiB
Diff
From a9f65413f9ea81ef2208da66a3db9cb8a9020eef Mon Sep 17 00:00:00 2001
|
|
From: Maxime Bizon <mbizon@freebox.fr>
|
|
Date: Fri, 18 Jul 2008 15:53:08 +0200
|
|
Subject: [PATCH] [MIPS] BCM63XX: Add Broadcom 63xx CPU definitions.
|
|
|
|
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
|
|
---
|
|
arch/mips/kernel/cpu-probe.c | 25 +++++++++++++++++++++++++
|
|
arch/mips/mm/tlbex.c | 4 ++++
|
|
arch/mips/include/asm/cpu.h | 7 +++++++
|
|
3 files changed, 36 insertions(+), 0 deletions(-)
|
|
|
|
--- a/arch/mips/kernel/cpu-probe.c
|
|
+++ b/arch/mips/kernel/cpu-probe.c
|
|
@@ -158,6 +158,9 @@ void __init check_wait(void)
|
|
case CPU_25KF:
|
|
case CPU_PR4450:
|
|
case CPU_BCM3302:
|
|
+ case CPU_BCM6338:
|
|
+ case CPU_BCM6348:
|
|
+ case CPU_BCM6358:
|
|
case CPU_CAVIUM_OCTEON:
|
|
cpu_wait = r4k_wait;
|
|
break;
|
|
@@ -855,6 +858,7 @@ static inline void cpu_probe_broadcom(st
|
|
{
|
|
decode_configs(c);
|
|
switch (c->processor_id & 0xff00) {
|
|
+ /* same as PRID_IMP_BCM6338 */
|
|
case PRID_IMP_BCM3302:
|
|
c->cputype = CPU_BCM3302;
|
|
__cpu_name[cpu] = "Broadcom BCM3302";
|
|
@@ -863,6 +867,26 @@ static inline void cpu_probe_broadcom(st
|
|
c->cputype = CPU_BCM4710;
|
|
__cpu_name[cpu] = "Broadcom BCM4710";
|
|
break;
|
|
+ case PRID_IMP_BCM6345:
|
|
+ c->cputype = CPU_BCM6345;
|
|
+ __cpu_name[cpu] = "Broadcom BCM6345";
|
|
+ break;
|
|
+ case PRID_IMP_BCM6348:
|
|
+ c->cputype = CPU_BCM6348;
|
|
+ __cpu_name[cpu] = "Broadcom BCM6348";
|
|
+ break;
|
|
+ case PRID_IMP_BCM4350:
|
|
+ switch (c->processor_id & 0xf0) {
|
|
+ case PRID_REV_BCM6358:
|
|
+ c->cputype = CPU_BCM6358;
|
|
+ __cpu_name[cpu] = "Broadcom BCM6358";
|
|
+ break;
|
|
+ default:
|
|
+ c->cputype = CPU_UNKNOWN;
|
|
+ __cpu_name[cpu] = "Broadcom BCM63xx";
|
|
+ break;
|
|
+ }
|
|
+ break;
|
|
}
|
|
}
|
|
|
|
--- a/arch/mips/mm/tlbex.c
|
|
+++ b/arch/mips/mm/tlbex.c
|
|
@@ -310,6 +310,10 @@ static void __cpuinit build_tlb_write_en
|
|
case CPU_BCM3302:
|
|
case CPU_BCM4710:
|
|
case CPU_LOONGSON2:
|
|
+ case CPU_BCM6338:
|
|
+ case CPU_BCM6345:
|
|
+ case CPU_BCM6348:
|
|
+ case CPU_BCM6358:
|
|
case CPU_CAVIUM_OCTEON:
|
|
case CPU_R5500:
|
|
if (m4kc_tlbp_war())
|
|
--- a/arch/mips/include/asm/cpu.h
|
|
+++ b/arch/mips/include/asm/cpu.h
|
|
@@ -113,6 +113,12 @@
|
|
|
|
#define PRID_IMP_BCM4710 0x4000
|
|
#define PRID_IMP_BCM3302 0x9000
|
|
+#define PRID_IMP_BCM6338 0x9000
|
|
+#define PRID_IMP_BCM6345 0x8000
|
|
+#define PRID_IMP_BCM6348 0x9100
|
|
+#define PRID_IMP_BCM4350 0xA000
|
|
+#define PRID_REV_BCM6358 0x0010
|
|
+#define PRID_REV_BCM6368 0x0030
|
|
|
|
/*
|
|
* These are the PRID's for when 23:16 == PRID_COMP_CAVIUM
|
|
@@ -210,6 +216,7 @@ enum cpu_type_enum {
|
|
*/
|
|
CPU_4KC, CPU_4KEC, CPU_4KSC, CPU_24K, CPU_34K, CPU_1004K, CPU_74K,
|
|
CPU_ALCHEMY, CPU_PR4450, CPU_BCM3302, CPU_BCM4710,
|
|
+ CPU_BCM6338, CPU_BCM6345, CPU_BCM6348, CPU_BCM6358,
|
|
|
|
/*
|
|
* MIPS64 class processors
|