kernel: fix bluetooth and zsmalloc for 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.13 / 312-MIPS-BCM63XX-remove-RUNTIME_DETECT-from-reset-code.patch
1 From 72578a46543821c5b9544842e45fcbed0c1b7eb8 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Tue, 3 Dec 2013 13:35:12 +0100
4 Subject: [PATCH 3/8] MIPS: BCM63XX: remove !RUNTIME_DETECT from reset code
5
6 ---
7 arch/mips/bcm63xx/reset.c | 60 -----------------------------------------------
8 1 file changed, 60 deletions(-)
9
10 --- a/arch/mips/bcm63xx/reset.c
11 +++ b/arch/mips/bcm63xx/reset.c
12 @@ -125,8 +125,6 @@
13 #define BCM6368_RESET_PCIE 0
14 #define BCM6368_RESET_PCIE_EXT 0
15
16 -#ifdef BCMCPU_RUNTIME_DETECT
17 -
18 /*
19 * core reset bits
20 */
21 @@ -188,64 +186,6 @@ static int __init bcm63xx_reset_bits_ini
22
23 return 0;
24 }
25 -#else
26 -
27 -#ifdef CONFIG_BCM63XX_CPU_3368
28 -static const u32 bcm63xx_reset_bits[] = {
29 - __GEN_RESET_BITS_TABLE(3368)
30 -};
31 -#define reset_reg PERF_SOFTRESET_6358_REG
32 -#endif
33 -
34 -#ifdef CONFIG_BCM63XX_CPU_6328
35 -static const u32 bcm63xx_reset_bits[] = {
36 - __GEN_RESET_BITS_TABLE(6328)
37 -};
38 -#define reset_reg PERF_SOFTRESET_6328_REG
39 -#endif
40 -
41 -#ifdef CONFIG_BCM63XX_CPU_6338
42 -static const u32 bcm63xx_reset_bits[] = {
43 - __GEN_RESET_BITS_TABLE(6338)
44 -};
45 -#define reset_reg PERF_SOFTRESET_REG
46 -#endif
47 -
48 -#ifdef CONFIG_BCM63XX_CPU_6345
49 -static const u32 bcm63xx_reset_bits[] = { };
50 -#define reset_reg 0
51 -#endif
52 -
53 -#ifdef CONFIG_BCM63XX_CPU_6348
54 -static const u32 bcm63xx_reset_bits[] = {
55 - __GEN_RESET_BITS_TABLE(6348)
56 -};
57 -#define reset_reg PERF_SOFTRESET_REG
58 -#endif
59 -
60 -#ifdef CONFIG_BCM63XX_CPU_6358
61 -static const u32 bcm63xx_reset_bits[] = {
62 - __GEN_RESET_BITS_TABLE(6358)
63 -};
64 -#define reset_reg PERF_SOFTRESET_6358_REG
65 -#endif
66 -
67 -#ifdef CONFIG_BCM63XX_CPU_6362
68 -static const u32 bcm63xx_reset_bits[] = {
69 - __GEN_RESET_BITS_TABLE(6362)
70 -};
71 -#define reset_reg PERF_SOFTRESET_6362_REG
72 -#endif
73 -
74 -#ifdef CONFIG_BCM63XX_CPU_6368
75 -static const u32 bcm63xx_reset_bits[] = {
76 - __GEN_RESET_BITS_TABLE(6368)
77 -};
78 -#define reset_reg PERF_SOFTRESET_6368_REG
79 -#endif
80 -
81 -static int __init bcm63xx_reset_bits_init(void) { return 0; }
82 -#endif
83
84 static DEFINE_SPINLOCK(reset_mutex);
85