diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-06-04 10:01:55 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-06-04 10:01:55 +0000 |
| commit | 5d27e16f2e3d7d64b904ef9ae63540ee8c976b90 (patch) | |
| tree | e6ed295a8e91ab48185e668ce4479075da6acbe1 | |
| parent | b904d677824bcf73a1b2f3ebc2d49e8ad3c2ad07 (diff) | |
| download | upstream-5d27e16f2e3d7d64b904ef9ae63540ee8c976b90.tar.gz upstream-5d27e16f2e3d7d64b904ef9ae63540ee8c976b90.tar.bz2 upstream-5d27e16f2e3d7d64b904ef9ae63540ee8c976b90.zip | |
[brcm63xx] cache gpio values in gpio_set
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16330 3c298f89-4303-0410-b956-a3cf2f4a3e73
| -rw-r--r-- | target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c | 13 |
1 files changed, 8 insertions, 5 deletions
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); } |