kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 334-MIPS-BCM63XX-add-support-for-BCM6368-variants.patch
1 From 311b0246d51e09d13464e76abb0e231c855dd333 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Sat, 7 Dec 2013 14:36:56 +0100
4 Subject: [PATCH 44/53] MIPS: BCM63XX: add support for BCM6368 variants
5
6 ---
7 arch/mips/bcm63xx/cpu.c | 4 ++++
8 arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h | 3 +++
9 2 files changed, 7 insertions(+)
10
11 --- a/arch/mips/bcm63xx/cpu.c
12 +++ b/arch/mips/bcm63xx/cpu.c
13 @@ -392,8 +392,12 @@ void __init bcm63xx_cpu_init(void)
14
15 break;
16 case BCM6368_CPU_ID:
17 + case BCM6369_CPU_ID:
18 bcm63xx_regs_base = bcm6368_regs_base;
19 bcm63xx_irqs = bcm6368_irqs;
20 +
21 + /* BCM6369 is a BCM6368 without xDSL, so treat it the same */
22 + bcm63xx_cpu_id = BCM6368_CPU_ID;
23 break;
24 default:
25 panic("unsupported broadcom CPU %x", bcm63xx_cpu_id);
26 --- a/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
27 +++ b/arch/mips/include/asm/mach-bcm63xx/bcm63xx_cpu.h
28 @@ -20,6 +20,7 @@
29 #define BCM6361_CPU_ID 0x6361
30 #define BCM6362_CPU_ID 0x6362
31 #define BCM6368_CPU_ID 0x6368
32 +#define BCM6369_CPU_ID 0x6369
33
34 void __init bcm63xx_cpu_init(void);
35 u32 bcm63xx_get_cpu_variant(void);
36 @@ -106,6 +107,8 @@ static inline u16 __pure bcm63xx_get_cpu
37 (bcm63xx_get_cpu_variant() == BCM6362_CPU_ID)
38 #define BCMCPU_VARIANT_IS_6368() \
39 (bcm63xx_get_cpu_variant() == BCM6368_CPU_ID)
40 +#define BCMCPU_VARIANT_IS_6369() \
41 + (bcm63xx_get_cpu_variant() == BCM6369_CPU_ID)
42
43 /*
44 * While registers sets are (mostly) the same across 63xx CPU, base