aboutsummaryrefslogtreecommitdiffstats
path: root/target/linux
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-01-11 18:00:50 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-01-11 18:00:50 +0000
commitfbf81c8e799deefec9cc7773aae9e4701dea10d3 (patch)
treed98adebc7cb77512a48e8f3d92f0e21c5fc4c9d4 /target/linux
parent034b7f0ef555c6e5842003f3c06770aa2023a756 (diff)
downloadupstream-fbf81c8e799deefec9cc7773aae9e4701dea10d3.tar.gz
upstream-fbf81c8e799deefec9cc7773aae9e4701dea10d3.tar.bz2
upstream-fbf81c8e799deefec9cc7773aae9e4701dea10d3.zip
ar71xx: move irq_to_gpio and gpio_to_irq into gpio.c
SVN-Revision: 29713
Diffstat (limited to 'target/linux')
-rw-r--r--target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c12
-rw-r--r--target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/gpio.h14
2 files changed, 14 insertions, 12 deletions
diff --git a/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c b/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
index eca3b5b76a..91c838345d 100644
--- a/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
+++ b/target/linux/ar71xx/files/arch/mips/ar71xx/gpio.c
@@ -288,3 +288,15 @@ void __init ar71xx_gpio_init(void)
if (err)
panic("cannot add AR71xx GPIO chip, error=%d", err);
}
+
+int gpio_to_irq(unsigned gpio)
+{
+ return AR71XX_GPIO_IRQ(gpio);
+}
+EXPORT_SYMBOL(gpio_to_irq);
+
+int irq_to_gpio(unsigned irq)
+{
+ return irq - AR71XX_GPIO_IRQ_BASE;
+}
+EXPORT_SYMBOL(irq_to_gpio);
diff --git a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/gpio.h b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/gpio.h
index 6354d68cf3..56fe902e26 100644
--- a/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/gpio.h
+++ b/target/linux/ar71xx/files/arch/mips/include/asm/mach-ar71xx/gpio.h
@@ -16,21 +16,11 @@
#define ARCH_NR_GPIOS 64
#include <asm-generic/gpio.h>
-#include <asm/mach-ar71xx/ar71xx.h>
-
extern unsigned long ar71xx_gpio_count;
extern void __ar71xx_gpio_set_value(unsigned gpio, int value);
extern int __ar71xx_gpio_get_value(unsigned gpio);
-
-static inline int gpio_to_irq(unsigned gpio)
-{
- return AR71XX_GPIO_IRQ(gpio);
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
- return irq - AR71XX_GPIO_IRQ_BASE;
-}
+int gpio_to_irq(unsigned gpio);
+int irq_to_gpio(unsigned gpio);
static inline int gpio_get_value(unsigned gpio)
{