From b7da6044662b62c5b0f8fded77ee85e63632fad1 Mon Sep 17 00:00:00 2001
From: florian <florian@3c298f89-4303-0410-b956-a3cf2f4a3e73>
Date: Thu, 27 Nov 2008 10:38:36 +0000
Subject: Commit changes on the files for gpiolib

git-svn-id: svn://svn.openwrt.org/openwrt/trunk@13374 3c298f89-4303-0410-b956-a3cf2f4a3e73
---
 .../include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h   |  4 --
 .../files/include/asm-mips/mach-bcm63xx/gpio.h     | 47 +++-------------------
 2 files changed, 6 insertions(+), 45 deletions(-)

(limited to 'target/linux/brcm63xx/files/include')

diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
index 31145dfa6..72cee75f0 100644
--- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
+++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/bcm63xx_gpio.h
@@ -4,10 +4,6 @@
 /* all helpers will BUG() if gpio count is >= 37. */
 #define BCM63XX_GPIO_COUNT	37
 
-void bcm63xx_gpio_set_dataout(int gpio, int val);
-int bcm63xx_gpio_get_datain(int gpio);
-void bcm63xx_gpio_set_direction(int gpio, int dir);
-
 #define GPIO_DIR_OUT	0x0
 #define GPIO_DIR_IN	0x1
 
diff --git a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h
index dd2c0f3d5..033c997af 100644
--- a/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h
+++ b/target/linux/brcm63xx/files/include/asm-mips/mach-bcm63xx/gpio.h
@@ -3,50 +3,15 @@
 
 #include <bcm63xx_gpio.h>
 
-static inline int gpio_is_valid(int number)
-{
-	return (number >= BCM63XX_GPIO_COUNT) ? 0 : 1;
-}
+#define NR_BUILTIN_GPIO		BCM63XX_GPIO_COUNT
 
-static inline int gpio_request(unsigned gpio, const char *label)
-{
-	return 0;
-}
+#define gpio_to_irq(gpio)	NULL
 
-static inline void gpio_free(unsigned gpio)
-{
-}
+#define gpio_get_value __gpio_get_value
+#define gpio_set_value __gpio_set_value
 
-static inline int gpio_direction_input(unsigned gpio)
-{
-	bcm63xx_gpio_set_direction(gpio, GPIO_DIR_IN);
-	return 0;
-}
+#define gpio_cansleep __gpio_cansleep
 
-static inline int gpio_direction_output(unsigned gpio, int value)
-{
-	bcm63xx_gpio_set_direction(gpio, GPIO_DIR_OUT);
-	return 0;
-}
-
-static inline int gpio_get_value(unsigned gpio)
-{
-	return bcm63xx_gpio_get_datain(gpio);
-}
-
-static inline void gpio_set_value(unsigned gpio, int value)
-{
-	bcm63xx_gpio_set_dataout(gpio, value);
-}
-
-static inline int gpio_to_irq(unsigned gpio)
-{
-	return gpio;
-}
-
-static inline int irq_to_gpio(unsigned irq)
-{
-	return irq;
-}
+#include <asm-generic/gpio.h>
 
 #endif /* __ASM_MIPS_MACH_BCM63XX_GPIO_H */
-- 
cgit v1.2.3