OpenWrt – Blame information for rev 2
?pathlinks?
Rev | Author | Line No. | Line |
---|---|---|---|
1 | office | 1 | From 04458c3db8eb79da21ecde40ab36a1dde52bef06 Mon Sep 17 00:00:00 2001 |
2 | From: Jonas Gorski <jogo@openwrt.org> |
||
3 | Date: Sat, 7 Dec 2013 14:33:28 +0100 |
||
4 | Subject: [PATCH 23/45] MIPS: BCM63XX: detect BCM6362 variants |
||
5 | |||
6 | --- |
||
7 | arch/mips/bcm63xx/cpu.c | 8 ++++++++ |
||
8 | arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 3 +++ |
||
9 | 2 files changed, 11 insertions(+) |
||
10 | |||
11 | --- a/arch/mips/bcm63xx/cpu.c |
||
12 | +++ b/arch/mips/bcm63xx/cpu.c |
||
13 | @@ -383,6 +383,14 @@ void __init bcm63xx_cpu_init(void) |
||
14 | case BCM6362_CPU_ID: |
||
15 | bcm63xx_regs_base = bcm6362_regs_base; |
||
16 | bcm63xx_irqs = bcm6362_irqs; |
||
17 | + |
||
18 | + if (varid == 1) |
||
19 | + bcm63xx_cpu_variant = BCM6362_CPU_ID; |
||
20 | + else if (varid == 2) |
||
21 | + bcm63xx_cpu_variant = BCM6361_CPU_ID; |
||
22 | + else |
||
23 | + pr_warn("unknown BCM6362 variant: %x\n", varid); |
||
24 | + |
||
25 | break; |
||
26 | case BCM6368_CPU_ID: |
||
27 | bcm63xx_regs_base = bcm6368_regs_base; |
||
28 | --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h |
||
29 | +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h |
||
30 | @@ -17,6 +17,7 @@ |
||
31 | #define BCM6345_CPU_ID 0x6345 |
||
32 | #define BCM6348_CPU_ID 0x6348 |
||
33 | #define BCM6358_CPU_ID 0x6358 |
||
34 | +#define BCM6361_CPU_ID 0x6361 |
||
35 | #define BCM6362_CPU_ID 0x6362 |
||
36 | #define BCM6368_CPU_ID 0x6368 |
||
37 | |||
38 | @@ -99,6 +100,8 @@ static inline u16 __pure bcm63xx_get_cpu |
||
39 | (bcm63xx_get_cpu_variant() == BCM6348_CPU_ID) |
||
40 | #define BCMCPU_VARIANT_IS_6358() \ |
||
41 | (bcm63xx_get_cpu_cariant() == BCM6358_CPU_ID) |
||
42 | +#define BCMCPU_VARIANT_IS_6361() \ |
||
43 | + (bcm63xx_get_cpu_variant() == BCM6361_CPU_ID) |
||
44 | #define BCMCPU_VARIANT_IS_6362() \ |
||
45 | (bcm63xx_get_cpu_variant() == BCM6362_CPU_ID) |
||
46 | #define BCMCPU_VARIANT_IS_6368() \ |