summaryrefslogtreecommitdiffstats
path: root/target/linux/ar7/files/include/asm-mips
diff options
context:
space:
mode:
authorejka <ejka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-21 12:37:50 +0000
committerejka <ejka@3c298f89-4303-0410-b956-a3cf2f4a3e73>2007-09-21 12:37:50 +0000
commit35a0fb9185194743f1d43c07dea98347e052a96a (patch)
treef6c8e7ecf7b2d3f53aa96fd8062af9d2774dce18 /target/linux/ar7/files/include/asm-mips
parent9fb66acf6351fde2162c690b2e238f4c438febb0 (diff)
make gpio conformant to generic gpio spec.
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@8911 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/ar7/files/include/asm-mips')
-rw-r--r--target/linux/ar7/files/include/asm-mips/ar7/gpio.h53
1 files changed, 27 insertions, 26 deletions
diff --git a/target/linux/ar7/files/include/asm-mips/ar7/gpio.h b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
index c82ba78cf..a7ae1eeae 100644
--- a/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
+++ b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
@@ -22,24 +22,37 @@
#define AR7_GPIO_MAX 32
-extern int gpio_request(unsigned gpio, char *label);
+extern int gpio_request(unsigned gpio, const char *label);
extern void gpio_free(unsigned gpio);
/* Common GPIO layer */
-static inline int gpio_direction_input(unsigned gpio)
+static inline int gpio_get_value(unsigned gpio)
{
- void __iomem *gpio_dir =
- (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
+ void __iomem *gpio_in =
+ (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
- writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
+ return ((readl(gpio_in) & (1 << gpio)) != 0);
+}
- return 0;
+static inline void gpio_set_value(unsigned gpio, int value)
+{
+ void __iomem *gpio_out =
+ (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
+ volatile unsigned tmp;
+
+ if (gpio >= AR7_GPIO_MAX)
+ return;
+
+ tmp = readl(gpio_out) & ~(1 << gpio);
+ if (value)
+ tmp |= 1 << gpio;
+ writel(tmp, gpio_out);
}
-static inline int gpio_direction_output(unsigned gpio)
+static inline int gpio_direction_input(unsigned gpio)
{
void __iomem *gpio_dir =
(void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
@@ -47,35 +60,23 @@ static inline int gpio_direction_output(unsigned gpio)
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
- writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);
+ writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
return 0;
}
-static inline int gpio_get_value(unsigned gpio)
+static inline int gpio_direction_output(unsigned gpio, int value)
{
- void __iomem *gpio_in =
- (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
+ void __iomem *gpio_dir =
+ (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
if (gpio >= AR7_GPIO_MAX)
return -EINVAL;
- return ((readl(gpio_in) & (1 << gpio)) != 0);
-}
-
-static inline void gpio_set_value(unsigned gpio, int value)
-{
- void __iomem *gpio_out =
- (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
- volatile unsigned tmp;
-
- if (gpio >= AR7_GPIO_MAX)
- return;
+ gpio_set_value(gpio, value);
+ writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);
- tmp = readl(gpio_out) & ~(1 << gpio);
- if (value)
- tmp |= 1 << gpio;
- writel(tmp, gpio_out);
+ return 0;
}
static inline int gpio_to_irq(unsigned gpio)