From: Florian Fainelli <florian@openwrt.org>
Date: Thu, 4 Jun 2009 10:01:55 +0000 (+0000)
Subject: cache gpio values in gpio_set
X-Git-Url: http://git.lede-project.org./?a=commitdiff_plain;h=9013e936ed5d8c5f5c46d5de45f785ebf866f04c;p=openwrt%2Fstaging%2Fneocturne.git

cache gpio values in gpio_set

SVN-Revision: 16330
---

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
index 97e3730c34..77636aa86c 100644
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
@@ -18,12 +18,14 @@
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
 
+static u32 gpio_out_low, gpio_out_high;
+
 static void bcm63xx_gpio_set(struct gpio_chip *chip,
 				unsigned gpio, int val)
 {
 	u32 reg;
 	u32 mask;
-	u32 tmp;
+	u32 *v;
 	unsigned long flags;
 
 	if (gpio >= chip->ngpio)
@@ -32,18 +34,19 @@ static void bcm63xx_gpio_set(struct gpio_chip *chip,
 	if (gpio < 32) {
 		reg = GPIO_DATA_LO_REG;
 		mask = 1 << gpio;
+		v = &gpio_out_low;
 	} else {
 		reg = GPIO_DATA_HI_REG;
 		mask = 1 << (gpio - 32);
+		v = &gpio_out_high;
 	}
 
 	local_irq_save(flags);
-	tmp = bcm_gpio_readl(reg);
 	if (val)
-		tmp |= mask;
+		*v |= mask;
 	else
-		tmp &= ~mask;
-	bcm_gpio_writel(tmp, reg);
+		*v &= ~mask;
+	bcm_gpio_writel(*v, reg);
 	local_irq_restore(flags);
 }