KumiSystems/openwrtv3
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

be SMP safe even with gpiolib

Browse source 
SVN-Revision: 16331
This commit is contained in:
Florian Fainelli 2009-06-04 10:02:23 +00:00
parent 9013e936ed
commit 287a0efd68
1 changed files with 8 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
View file

@ -18,6 +18,7 @@
#include <bcm63xx_io.h> #include <bcm63xx_io.h>
#include <bcm63xx_regs.h> #include <bcm63xx_regs.h>
static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
static u32 gpio_out_low, gpio_out_high; static u32 gpio_out_low, gpio_out_high;
static void bcm63xx_gpio_set(struct gpio_chip *chip, static void bcm63xx_gpio_set(struct gpio_chip *chip,
@ -41,13 +42,13 @@ static void bcm63xx_gpio_set(struct gpio_chip *chip,
v = &gpio_out_high; v = &gpio_out_high;
} }
local_irq_save(flags); spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
if (val) if (val)
*v |= mask; *v |= mask;
else else
*v &= ~mask; *v &= ~mask;
bcm_gpio_writel(*v, reg); 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) static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio)
@ -88,14 +89,14 @@ static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
mask = 1 << (gpio - 32); mask = 1 << (gpio - 32);
} }
local_irq_save(flags); spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
tmp = bcm_gpio_readl(reg); tmp = bcm_gpio_readl(reg);
if (dir == GPIO_DIR_IN) if (dir == GPIO_DIR_IN)
tmp &= ~mask; tmp &= ~mask;
else else
tmp |= mask; tmp |= mask;
bcm_gpio_writel(tmp, reg); bcm_gpio_writel(tmp, reg);
local_irq_restore(flags); spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags);
return 0; return 0;
} }