qi-hardware/openwrt-xburst
1
0
Fork 0
mirror of git://projects.qi-hardware.com/openwrt-xburst.git synced 2024-11-24 05:12:29 +02:00
Code

[brcm63xx] be SMP safe even with gpiolib

Browse Source 
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@16331 3c298f89-4303-0410-b956-a3cf2f4a3e73
This commit is contained in:
florian 2009-06-04 10:02:23 +00:00
parent 9486190f3f
commit 415b07a0e8
1 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

15
target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
View File

@ -18,10 +18,11 @@
#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,
unsigned gpio, int val) unsigned gpio, int val)
{ {
u32 reg; u32 reg;
u32 mask; u32 mask;
@ -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)
@ -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, static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
unsigned gpio, int dir) unsigned gpio, int dir)
{ {
u32 reg; u32 reg;
u32 mask; u32 mask;
@ -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;
} }
@ -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, static int bcm63xx_gpio_direction_output(struct gpio_chip *chip,
unsigned gpio, int value) unsigned gpio, int value)
{ {
bcm63xx_gpio_set(chip, gpio, value); bcm63xx_gpio_set(chip, gpio, value);
return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT); return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT);