aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorJonas Gorski <jogo@openwrt.org>2014-07-08 10:53:20 -0400
committerRalf Baechle <ralf@linux-mips.org>2014-07-30 09:23:06 -0400
commit53a02272e49260713f05c798953c6c9e04be4175 (patch)
tree0a77f55d1d2920997cad404a768483660ca96cfd
parentfe0a5f1c28467842e943d7f91cc450cc532d9923 (diff)
MIPS: BCM63xx: Remove !RUNTIME_DETECT code from gpio code
Signed-off-by: Jonas Gorski <jogo@openwrt.org> Cc: linux-mips@linux-mips.org Cc: John Crispin <blogic@openwrt.org> Cc: Maxime Bizon <mbizon@freebox.fr> Cc: Florian Fainelli <florian@openwrt.org> Cc: Kevin Cernekee <cernekee@gmail.com> Patchwork: https://patchwork.linux-mips.org/patch/7269/ Signed-off-by: Ralf Baechle <ralf@linux-mips.org>
-rw-r--r--arch/mips/bcm63xx/gpio.c14
1 files changed, 0 insertions, 14 deletions
diff --git a/arch/mips/bcm63xx/gpio.c b/arch/mips/bcm63xx/gpio.c
index a6c2135dbf38..468bc7b99cd3 100644
--- a/arch/mips/bcm63xx/gpio.c
+++ b/arch/mips/bcm63xx/gpio.c
@@ -18,19 +18,6 @@
18#include <bcm63xx_io.h> 18#include <bcm63xx_io.h>
19#include <bcm63xx_regs.h> 19#include <bcm63xx_regs.h>
20 20
21#ifndef BCMCPU_RUNTIME_DETECT
22#define gpio_out_low_reg GPIO_DATA_LO_REG
23#ifdef CONFIG_BCM63XX_CPU_6345
24#ifdef gpio_out_low_reg
25#undef gpio_out_low_reg
26#define gpio_out_low_reg GPIO_DATA_LO_REG_6345
27#endif /* gpio_out_low_reg */
28#endif /* CONFIG_BCM63XX_CPU_6345 */
29
30static inline void bcm63xx_gpio_out_low_reg_init(void)
31{
32}
33#else /* ! BCMCPU_RUNTIME_DETECT */
34static u32 gpio_out_low_reg; 21static u32 gpio_out_low_reg;
35 22
36static void bcm63xx_gpio_out_low_reg_init(void) 23static void bcm63xx_gpio_out_low_reg_init(void)
@@ -44,7 +31,6 @@ static void bcm63xx_gpio_out_low_reg_init(void)
44 break; 31 break;
45 } 32 }
46} 33}
47#endif /* ! BCMCPU_RUNTIME_DETECT */
48 34
49static DEFINE_SPINLOCK(bcm63xx_gpio_lock); 35static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
50static u32 gpio_out_low, gpio_out_high; 36static u32 gpio_out_low, gpio_out_high;