brcm63xx: update development kernel to linux 3.14
[openwrt/svn-archive/archive.git] / target / linux / brcm63xx / patches-3.14 / 313-MIPS-BCM63XX-remove-RUNTIME_DETECT-code-from-gpio.patch
1 From 1aab93c5c97c55fef130726a6f58c9a1fd5b6240 Mon Sep 17 00:00:00 2001
2 From: Jonas Gorski <jogo@openwrt.org>
3 Date: Tue, 3 Dec 2013 13:36:45 +0100
4 Subject: [PATCH 4/8] MIPS: BCM63XX: remove !RUNTIME_DETECT code from gpio
5
6 ---
7 arch/mips/bcm63xx/gpio.c | 14 --------------
8 1 file changed, 14 deletions(-)
9
10 --- a/arch/mips/bcm63xx/gpio.c
11 +++ b/arch/mips/bcm63xx/gpio.c
12 @@ -18,19 +18,6 @@
13 #include <bcm63xx_io.h>
14 #include <bcm63xx_regs.h>
15
16 -#ifndef BCMCPU_RUNTIME_DETECT
17 -#define gpio_out_low_reg GPIO_DATA_LO_REG
18 -#ifdef CONFIG_BCM63XX_CPU_6345
19 -#ifdef gpio_out_low_reg
20 -#undef gpio_out_low_reg
21 -#define gpio_out_low_reg GPIO_DATA_LO_REG_6345
22 -#endif /* gpio_out_low_reg */
23 -#endif /* CONFIG_BCM63XX_CPU_6345 */
24 -
25 -static inline void bcm63xx_gpio_out_low_reg_init(void)
26 -{
27 -}
28 -#else /* ! BCMCPU_RUNTIME_DETECT */
29 static u32 gpio_out_low_reg;
30
31 static void bcm63xx_gpio_out_low_reg_init(void)
32 @@ -44,7 +31,6 @@ static void bcm63xx_gpio_out_low_reg_ini
33 break;
34 }
35 }
36 -#endif /* ! BCMCPU_RUNTIME_DETECT */
37
38 static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
39 static u32 gpio_out_low, gpio_out_high;