diff options
author | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-03 21:42:07 +0000 |
---|---|---|
committer | jogo <jogo@3c298f89-4303-0410-b956-a3cf2f4a3e73> | 2012-07-03 21:42:07 +0000 |
commit | cc1b8fb1cb225208e797bf235ccc8dd45219c74d (patch) | |
tree | d1dd3b8f4e5289e213cdfe3344f74d72aaf01212 /target/linux/brcm63xx/patches-3.3/310-MIPS-BCM63XX-use-the-Chip-ID-register-for-identifyin.patch | |
parent | 5a8d0fdaf3fda851347041d42ce3753454afa296 (diff) |
bcm63xx: update patches to latest upstream versions
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@32591 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/brcm63xx/patches-3.3/310-MIPS-BCM63XX-use-the-Chip-ID-register-for-identifyin.patch')
-rw-r--r-- | target/linux/brcm63xx/patches-3.3/310-MIPS-BCM63XX-use-the-Chip-ID-register-for-identifyin.patch | 47 |
1 files changed, 0 insertions, 47 deletions
diff --git a/target/linux/brcm63xx/patches-3.3/310-MIPS-BCM63XX-use-the-Chip-ID-register-for-identifyin.patch b/target/linux/brcm63xx/patches-3.3/310-MIPS-BCM63XX-use-the-Chip-ID-register-for-identifyin.patch deleted file mode 100644 index 30adbd198..000000000 --- a/target/linux/brcm63xx/patches-3.3/310-MIPS-BCM63XX-use-the-Chip-ID-register-for-identifyin.patch +++ /dev/null @@ -1,47 +0,0 @@ -From d831de57b1995eff51f43310b4bbfa85b1a3df42 Mon Sep 17 00:00:00 2001 -From: Jonas Gorski <jonas.gorski@gmail.com> -Date: Fri, 30 Dec 2011 02:37:47 +0100 -Subject: [PATCH 38/79] MIPS: BCM63XX: use the Chip ID register for - identifying the SoC - -Newer BCM63XX SoCs use virtually the same cpu ID. But since they all have -the Chip ID register at the same location, we can use that to identify -the SoC we are running on. - -Signed-off-by: Jonas Gorski <jonas.gorski@gmail.com> ---- - arch/mips/bcm63xx/cpu.c | 20 ++++++++++++-------- - 1 file changed, 12 insertions(+), 8 deletions(-) - ---- a/arch/mips/bcm63xx/cpu.c -+++ b/arch/mips/bcm63xx/cpu.c -@@ -228,17 +228,21 @@ void __init bcm63xx_cpu_init(void) - bcm63xx_irqs = bcm6345_irqs; - break; - case CPU_BMIPS4350: -- switch (read_c0_prid() & 0xf0) { -- case 0x10: -+ if ((read_c0_prid() & 0xf0) == 0x10) { - expected_cpu_id = BCM6358_CPU_ID; - bcm63xx_regs_base = bcm6358_regs_base; - bcm63xx_irqs = bcm6358_irqs; -- break; -- case 0x30: -- expected_cpu_id = BCM6368_CPU_ID; -- bcm63xx_regs_base = bcm6368_regs_base; -- bcm63xx_irqs = bcm6368_irqs; -- break; -+ } else { -+ /* all newer chips have the same chip id location */ -+ u16 chip_id = bcm_readw(BCM_6368_PERF_BASE); -+ -+ switch (chip_id) { -+ case BCM6368_CPU_ID: -+ expected_cpu_id = BCM6368_CPU_ID; -+ bcm63xx_regs_base = bcm6368_regs_base; -+ bcm63xx_irqs = bcm6368_irqs; -+ break; -+ } - } - break; - } |