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 a7ae1eeae1099fb40a73c452228332b42b092e59..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
@@ -28,25 +28,28 @@ extern void gpio_free(unsigned gpio);
 /* Common GPIO layer */
 static inline int gpio_get_value(unsigned gpio)
 {
-       void __iomem *gpio_in =
-               (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_INPUT);
+       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);
+       }
 
-       return ((readl(gpio_in) & (1 << gpio)) != 0);
+       return addr & (1 << gpio);
 }
 
 static inline void gpio_set_value(unsigned gpio, int value)
 {
+       static unsigned addr;
+       unsigned tmp;
+
        void __iomem *gpio_out =
                (void __iomem *)KSEG1ADDR(AR7_REGS_GPIO + AR7_GPIO_OUTPUT);
-       volatile unsigned tmp;
+       if (!addr)
+               addr = readl(gpio_out);
 
-       if (gpio >= AR7_GPIO_MAX)
-               return;
-
-       tmp = readl(gpio_out) & ~(1 << gpio);
+       tmp = addr & ~(1 << gpio);
        if (value)
                tmp |= 1 << gpio;
        writel(tmp, gpio_out);
@@ -95,9 +98,6 @@ 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;
-
        writel(readl(gpio_en) | (1 << gpio), gpio_en);
 
        return 0;
@@ -108,9 +108,6 @@ 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;
-
        writel(readl(gpio_en) & ~(1 << gpio), gpio_en);
 
        return 0;