40 lines
1.1 KiB
Diff
40 lines
1.1 KiB
Diff
|
From 1aab93c5c97c55fef130726a6f58c9a1fd5b6240 Mon Sep 17 00:00:00 2001
|
||
|
|
From: Jonas Gorski <jogo@openwrt.org>
|
||
|
|
Date: Tue, 3 Dec 2013 13:36:45 +0100
|
||
|
|
Subject: [PATCH 4/8] MIPS: BCM63XX: remove !RUNTIME_DETECT code from gpio
|
||
|
|
|
||
|
|
---
|
||
|
|
arch/mips/bcm63xx/gpio.c | 14 --------------
|
||
|
|
1 file changed, 14 deletions(-)
|
||
|
|
|
||
|
|
--- a/arch/mips/bcm63xx/gpio.c
|
||
|
|
+++ b/arch/mips/bcm63xx/gpio.c
|
||
|
|
@@ -18,19 +18,6 @@
|
||
|
|
#include <bcm63xx_io.h>
|
||
|
|
#include <bcm63xx_regs.h>
|
||
|
|
|
||
|
|
-#ifndef BCMCPU_RUNTIME_DETECT
|
||
|
|
-#define gpio_out_low_reg GPIO_DATA_LO_REG
|
||
|
|
-#ifdef CONFIG_BCM63XX_CPU_6345
|
||
|
|
-#ifdef gpio_out_low_reg
|
||
|
|
-#undef gpio_out_low_reg
|
||
|
|
-#define gpio_out_low_reg GPIO_DATA_LO_REG_6345
|
||
|
|
-#endif /* gpio_out_low_reg */
|
||
|
|
-#endif /* CONFIG_BCM63XX_CPU_6345 */
|
||
|
|
-
|
||
|
|
-static inline void bcm63xx_gpio_out_low_reg_init(void)
|
||
|
|
-{
|
||
|
|
-}
|
||
|
|
-#else /* ! BCMCPU_RUNTIME_DETECT */
|
||
|
|
static u32 gpio_out_low_reg;
|
||
|
|
|
||
|
|
static void bcm63xx_gpio_out_low_reg_init(void)
|
||
|
|
@@ -44,7 +31,6 @@ static void bcm63xx_gpio_out_low_reg_ini
|
||
|
|
break;
|
||
|
|
}
|
||
|
|
}
|
||
|
|
-#endif /* ! BCMCPU_RUNTIME_DETECT */
|
||
|
|
|
||
|
|
static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
|
||
|
|
static u32 gpio_out_low, gpio_out_high;
|