cache GPIO addresses to be more efficent

[librecmc/librecmc.git] / target / linux / ar7 / files / include / asm-mips / ar7 / gpio.h

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 1cb11a377b7cb3ab678e34dc941a36b2304b3a34..7d665ff62dd6115a1f1bd4b8bd2a7995d4380442 100644 (file)
--- a/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
+++ b/target/linux/ar7/files/include/asm-mips/ar7/gpio.h
@@ -1,18 +1,16 @@
 /*
- * $Id: gpio.h 6693 2007-03-25 05:42:16Z ejka $
- * 
  * Copyright (C) 2007 OpenWrt.org
- * 
+ *
  * This program is free software; you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
  * the Free Software Foundation; either version 2 of the License, or
  * (at your option) any later version.
- * 
+ *
  * This program is distributed in the hope that it will be useful,
  * but WITHOUT ANY WARRANTY; without even the implied warranty of
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
  * GNU General Public License for more details.
- * 
+ *
  * You should have received a copy of the GNU General Public License
  * along with this program; if not, write to the Free Software
  * Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA  02110-1301  USA
@@ -24,56 +22,64 @@
 
 #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);
+       static unsigned addr;
 
-       if (gpio >= AR7_GPIO_MAX)
-               return -EINVAL;
+       if (!addr) {
+               void __iomem *gpio_in = (void __iomem *)
+                               KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
+               addr = readl(gpio_in);
+       }
 
-       writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
-
-       return 0;
+       return addr & (1 << gpio);
 }
 
-static inline int gpio_direction_output(unsigned gpio)
+static inline void gpio_set_value(unsigned gpio, int value)
 {
-       void __iomem *gpio_dir = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
+       static unsigned addr;
+       unsigned tmp;
 
-       if (gpio >= AR7_GPIO_MAX)
-               return -EINVAL;
-
-       writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);
+       void __iomem *gpio_out =
+               (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
+       if (!addr)
+               addr = readl(gpio_out);
 
-       return 0;
+       tmp = addr & ~(1 << gpio);
+       if (value)
+               tmp |= 1 << gpio;
+       writel(tmp, gpio_out);
 }
 
-static inline int gpio_get_value(unsigned gpio)
+static inline int gpio_direction_input(unsigned gpio)
 {
-       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);
+       writel(readl(gpio_dir) | (1 << gpio), gpio_dir);
+
+       return 0;
 }
 
-static inline void gpio_set_value(unsigned gpio, int value)
+static inline int gpio_direction_output(unsigned gpio, int value)
 {
-       void __iomem *gpio_out = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
-       volatile unsigned tmp;
+       void __iomem *gpio_dir =
+               (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_DIR);
 
        if (gpio >= AR7_GPIO_MAX)
-               return;
+               return -EINVAL;
 
-       tmp = readl(gpio_out) & ~(1 << gpio);
-       if (value) 
-               tmp |= 1 << gpio;
-       writel(tmp, gpio_out);
+       gpio_set_value(gpio, value);
+       writel(readl(gpio_dir) & ~(1 << gpio), gpio_dir);
+
+       return 0;
 }
 
 static inline int gpio_to_irq(unsigned gpio)
@@ -89,10 +95,8 @@ static inline int irq_to_gpio(unsigned irq)
 /* Board specific GPIO functions */
 static inline int ar7_gpio_enable(unsigned gpio)
 {
-       void __iomem *gpio_en = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
-
-       if (gpio >= AR7_GPIO_MAX)
-               return -EINVAL;
+       void __iomem *gpio_en =
+               (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
 
        writel(readl(gpio_en) | (1 << gpio), gpio_en);
 
@@ -101,10 +105,8 @@ static inline int ar7_gpio_enable(unsigned gpio)
 
 static inline int ar7_gpio_disable(unsigned gpio)
 {
-       void __iomem *gpio_en = (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
-
-       if (gpio >= AR7_GPIO_MAX)
-               return -EINVAL;
+       void __iomem *gpio_en =
+               (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_ENABLE);
 
        writel(readl(gpio_en) & ~(1 << gpio), gpio_en);