[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 2c203a6..53e4664 100644 (file)
--- a/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
+++ b/target/linux/brcm63xx/files/arch/mips/bcm63xx/gpio.c
@@ -4,54 +4,59 @@
  * for more details.
  *
  * Copyright (C) 2008 Maxime Bizon <mbizon@freebox.fr>
+ * Copyright (C) 2008 Florian Fainelli <florian@openwrt.org>
  */
 
 #include <linux/kernel.h>
 #include <linux/module.h>
 #include <linux/spinlock.h>
+#include <linux/platform_device.h>
+#include <linux/gpio.h>
+
 #include <bcm63xx_cpu.h>
 #include <bcm63xx_gpio.h>
 #include <bcm63xx_io.h>
 #include <bcm63xx_regs.h>
 
 static DEFINE_SPINLOCK(bcm63xx_gpio_lock);
+static u32 gpio_out_low, gpio_out_high;
 
-void bcm63xx_gpio_set_dataout(int gpio, int val)
+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 >= BCM63XX_GPIO_COUNT)
+       if (gpio >= chip->ngpio)
                BUG();
 
        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;
        }
 
        spin_lock_irqsave(&bcm63xx_gpio_lock, 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);
        spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags);
 }
 
-EXPORT_SYMBOL(bcm63xx_gpio_set_dataout);
-
-int bcm63xx_gpio_get_datain(int gpio)
+static int bcm63xx_gpio_get(struct gpio_chip *chip, unsigned gpio)
 {
        u32 reg;
        u32 mask;
 
-       if (gpio >= BCM63XX_GPIO_COUNT)
+       if (gpio >= chip->ngpio)
                BUG();
 
        if (gpio < 32) {
@@ -65,16 +70,15 @@ int bcm63xx_gpio_get_datain(int gpio)
        return !!(bcm_gpio_readl(reg) & mask);
 }
 
-EXPORT_SYMBOL(bcm63xx_gpio_get_datain);
-
-void bcm63xx_gpio_set_direction(int gpio, int dir)
+static int bcm63xx_gpio_set_direction(struct gpio_chip *chip,
+                                     unsigned gpio, int dir)
 {
        u32 reg;
        u32 mask;
        u32 tmp;
        unsigned long flags;
 
-       if (gpio >= BCM63XX_GPIO_COUNT)
+       if (gpio >= chip->ngpio)
                BUG();
 
        if (gpio < 32) {
@@ -93,6 +97,35 @@ void bcm63xx_gpio_set_direction(int gpio, int dir)
                tmp |= mask;
        bcm_gpio_writel(tmp, reg);
        spin_unlock_irqrestore(&bcm63xx_gpio_lock, flags);
+
+       return 0;
 }
 
-EXPORT_SYMBOL(bcm63xx_gpio_set_direction);
+static int bcm63xx_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
+{
+       return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_IN);
+}
+
+static int bcm63xx_gpio_direction_output(struct gpio_chip *chip,
+                                        unsigned gpio, int value)
+{
+       bcm63xx_gpio_set(chip, gpio, value);
+       return bcm63xx_gpio_set_direction(chip, gpio, GPIO_DIR_OUT);
+}
+
+
+static struct gpio_chip bcm63xx_gpio_chip = {
+       .label                  = "bcm63xx-gpio",
+       .direction_input        = bcm63xx_gpio_direction_input,
+       .direction_output       = bcm63xx_gpio_direction_output,
+       .get                    = bcm63xx_gpio_get,
+       .set                    = bcm63xx_gpio_set,
+       .base                   = 0,
+};
+
+int __init bcm63xx_gpio_init(void)
+{
+       bcm63xx_gpio_chip.ngpio = bcm63xx_gpio_count();
+       printk(KERN_INFO "registering %d GPIOs\n", bcm63xx_gpio_chip.ngpio);
+       return gpiochip_add(&bcm63xx_gpio_chip);
+}