From: Ralf Baechle <ralf@linux-mips.org>
To: linux-mips@linux-mips.org
Cc: Maxime Bizon <mbizon@freebox.fr>, Florian Fainelli <florian@openwrt.org>
Subject: [patch 01/12] MIPS: BCM63XX: Add Broadcom 63xx CPU definitions.
Date: Wed, 01 Jul 2009 12:29:27 +0100 [thread overview]
Message-ID: <20090701120939.353587047@linux-mips.org> (raw)
In-Reply-To: 20090701112926.825088732@linux-mips.org
[-- Attachment #1: 0001.patch --]
[-- Type: text/plain, Size: 2572 bytes --]
From: Maxime Bizon <mbizon@freebox.fr>
Todo: Nothing ever detects CPU_BCM6338 but the code tests for it anyway.
Signed-off-by: Maxime Bizon <mbizon@freebox.fr>
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
arch/mips/include/asm/cpu.h | 7 +++++++
arch/mips/kernel/cpu-probe.c | 24 ++++++++++++++++++++++++
arch/mips/mm/tlbex.c | 4 ++++
3 files changed, 35 insertions(+)
--- 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
--- a/arch/mips/kernel/cpu-probe.c
+++ b/arch/mips/kernel/cpu-probe.c
@@ -159,6 +159,10 @@ void __init check_wait(void)
case CPU_25KF:
case CPU_PR4450:
case CPU_BCM3302:
+ case CPU_BCM6338:
+ case CPU_BCM6345:
+ case CPU_BCM6348:
+ case CPU_BCM6358:
case CPU_CAVIUM_OCTEON:
cpu_wait = r4k_wait;
break;
@@ -857,6 +861,7 @@ static inline void cpu_probe_broadcom(st
decode_configs(c);
switch (c->processor_id & 0xff00) {
case PRID_IMP_BCM3302:
+ /* same as PRID_IMP_BCM6338 */
c->cputype = CPU_BCM3302;
__cpu_name[cpu] = "Broadcom BCM3302";
break;
@@ -864,6 +869,25 @@ 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;
+ break;
+ }
+ break;
}
}
--- a/arch/mips/mm/tlbex.c
+++ b/arch/mips/mm/tlbex.c
@@ -321,6 +321,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_R5500:
if (m4kc_tlbp_war())
uasm_i_nop(p);
next prev parent reply other threads:[~2009-07-01 17:07 UTC|newest]
Thread overview: 13+ messages / expand[flat|nested] mbox.gz Atom feed top
2009-07-01 11:29 [patch 00/12] Add support for Broadcom BCM63xx SoCs Ralf Baechle
2009-07-01 11:29 ` Ralf Baechle [this message]
2009-07-01 11:29 ` [patch 02/12] MIPS: BCM63XX: Add support for the Broadcom BCM63xx family of SOCs Ralf Baechle
2009-07-01 11:29 ` [patch 03/12] MIPS: BCM63XX: Add serial driver for bcm63xx integrated UART Ralf Baechle
2009-07-01 11:29 ` [patch 04/12] MIPS: BCM63XX: Add PCI support Ralf Baechle
2009-07-01 11:29 ` [patch 05/12] MIPS: BCM63XX: Change PCI code to emulate a fake cardbus bridge Ralf Baechle
2009-07-01 11:29 ` [patch 06/12] MIPS: BCM63XX: Add PCMCIA & Cardbus support Ralf Baechle
2009-07-01 11:29 ` [patch 07/12] MIPS: BCM63XX: Add USB OHCI support Ralf Baechle
2009-07-01 11:29 ` [patch 08/12] MIPS: BCM63XX: Add USB EHCI support Ralf Baechle
2009-07-01 11:29 ` [patch 09/12] MIPS: BCM63XX: Add integrated ethernet mac support Ralf Baechle
2009-07-01 11:29 ` [patch 10/12] MIPS: BCM63XX: Add integrated ethernet PHY support for phylib Ralf Baechle
2009-07-01 11:29 ` [patch 11/12] MIPS: BCM63XX: Add board support code Ralf Baechle
2009-07-01 11:29 ` [patch 12/12] MIPS: BCM63XX: Add defconfig Ralf Baechle
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20090701120939.353587047@linux-mips.org \
--to=ralf@linux-mips.org \
--cc=florian@openwrt.org \
--cc=linux-mips@linux-mips.org \
--cc=mbizon@freebox.fr \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).