diff options
| author | Florian Fainelli <florian@openwrt.org> | 2009-06-04 10:02:23 +0000 |
|---|---|---|
| committer | Florian Fainelli <florian@openwrt.org> | 2009-06-04 10:02:23 +0000 |
| commit | 287a0efd683a0dfd10dd9048875e55a0fac64195 (patch) | |
| tree | 23ef40b3c0ee259757d88f5764c1d79cf34697ab | |
| parent | 9013e936ed5d8c5f5c46d5de45f785ebf866f04c (diff) | |
| download | upstream-287a0efd683a0dfd10dd9048875e55a0fac64195.tar.gz upstream-287a0efd683a0dfd10dd9048875e55a0fac64195.tar.bz2 upstream-287a0efd683a0dfd10dd9048875e55a0fac64195.zip | |
be SMP safe even with gpiolib
SVN-Revision: 16331
| -rw-r--r-- | target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c index 77636aa86c..53e46641a3 100644 --- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c +++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c @@ -18,10 +18,11 @@ #include <bcm63xx_io.h> #include <bcm63xx_regs.h> +static DEFINE_SPINLOCK(bcm63xx_gpio_lock); static u32 gpio_out_low, gpio_out_high; static void bcm63xx_gpio_set(struct gpio_chip *chip, - unsigned gpio, int val) + unsigned gpio, int val) { u32 reg; u32 mask; @@ -41,13 +42,13 @@ static void bcm63xx_gpio_set(struct gpio_chip *chip, v = &gpio_out_high; } - local_irq_save(flags); + spin_lock_irqsave(&bcm63xx_gpio_lock, flags); if (val) *v |= mask; else *v &= ~mask; bcm_gpio_writel(*v, reg); - local_irq_restore(flags); + spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags); } static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio) @@ -70,7 +71,7 @@ static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio) } static int bcm63xx_gpio_set_direction(struct gpio_chip *chip, - unsigned gpio, int dir) + unsigned gpio, int dir) { u32 reg; u32 mask; @@ -88,14 +89,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip, mask = 1 << (gpio - 32); } - local_irq_save(flags); + spin_lock_irqsave(&bcm63xx_gpio_lock, flags); tmp = bcm_gpio_readl(reg); if (dir == GPIO_DIR_IN) tmp &= ~mask; else tmp |= mask; bcm_gpio_writel(tmp, reg); - local_irq_restore(flags); + spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags); return 0; } @@ -106,7 +107,7 @@ static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio) } static int bcm63xx_gpio_direction_output(struct gpio_chip *chip, - unsigned gpio, int value) + unsigned gpio, int value) { bcm63xx_gpio_set(chip, gpio, value); return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT); |