[kernel] brcm63xx: fix cardbus support with BCM6358 (closes: #5918)

[openwrt.git] / target / linux / brcm63xx / files / arch / mips / bcm63xx / gpio.c

diff --git a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
index 97e3730..53e4664 100644 (file)
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
@@ -18,12 +18,15 @@
 #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;
-       u32 tmp;
+       u32 *v;
        unsigned long flags;
 
        if (gpio >= chip->ngpio)
@@ -32,19 +35,20 @@ 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);
+       spin_lock_irqsave(&bcm63xx_gpio_lock, flags);
        if (val)
-               tmp |= mask;
+               *v |= mask;
        else
-               tmp &= ~mask;
-       bcm_gpio_writel(tmp, reg);
-       local_irq_restore(flags);
+               *v &= ~mask;
+       bcm_gpio_writel(*v, reg);
+       spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags);
 }
 
 static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio)
@@ -67,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;
@@ -85,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;
 }
@@ -103,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);