6 files changed, 199 insertions, 5 deletions

diff --git a/drivers/bcma/Kconfig b/drivers/bcma/Kconfig
index a533af218368..d7b56a88c9f4 100644
--- a/drivers/bcma/Kconfig
+++ b/drivers/bcma/Kconfig
@@ -65,6 +65,15 @@ config BCMA_DRIVER_GMAC_CMN
 
           If unsure, say N
 
+config BCMA_DRIVER_GPIO
+        bool "BCMA GPIO driver"
+        depends on BCMA
+        select GPIOLIB
+        help
+          Driver to provide access to the GPIO pins of the bcma bus.
+
+          If unsure, say N
+
 config BCMA_DEBUG
         bool "BCMA debugging"
         depends on BCMA
diff --git a/drivers/bcma/Makefile b/drivers/bcma/Makefile
index 8ad42d41b2f2..734b32f09c0a 100644
--- a/drivers/bcma/Makefile
+++ b/drivers/bcma/Makefile
@@ -6,6 +6,7 @@ bcma-y					+= driver_pci.o
 bcma-$(CONFIG_BCMA_DRIVER_PCI_HOSTMODE) += driver_pci_host.o
 bcma-$(CONFIG_BCMA_DRIVER_MIPS)         += driver_mips.o
 bcma-$(CONFIG_BCMA_DRIVER_GMAC_CMN)     += driver_gmac_cmn.o
+bcma-$(CONFIG_BCMA_DRIVER_GPIO)         += driver_gpio.o
 bcma-$(CONFIG_BCMA_HOST_PCI)            += host_pci.o
 bcma-$(CONFIG_BCMA_HOST_SOC)            += host_soc.o
 obj-$(CONFIG_BCMA)                      += bcma.o
diff --git a/drivers/bcma/bcma_private.h b/drivers/bcma/bcma_private.h
index 537ae53231cd..4a2d72ec6d43 100644
--- a/drivers/bcma/bcma_private.h
+++ b/drivers/bcma/bcma_private.h
@@ -91,4 +91,14 @@ bool __devinit bcma_core_pci_is_in_hostmode(struct bcma_drv_pci *pc);
 void __devinit bcma_core_pci_hostmode_init(struct bcma_drv_pci *pc);
 #endif /* CONFIG_BCMA_DRIVER_PCI_HOSTMODE */
 
+#ifdef CONFIG_BCMA_DRIVER_GPIO
+/* driver_gpio.c */
+int bcma_gpio_init(struct bcma_drv_cc *cc);
+#else
+static inline int bcma_gpio_init(struct bcma_drv_cc *cc)
+{
+        return -ENOTSUPP;
+}
+#endif /* CONFIG_BCMA_DRIVER_GPIO */
+
 #endif
diff --git a/drivers/bcma/driver_chipcommon.c b/drivers/bcma/driver_chipcommon.c
index dc96dd8ebff2..e461ad25fda4 100644
--- a/drivers/bcma/driver_chipcommon.c
+++ b/drivers/bcma/driver_chipcommon.c
@@ -114,6 +114,8 @@ void bcma_core_chipcommon_early_init(struct bcma_drv_cc *cc)
         if (cc->early_setup_done)
                 return;
 
+        spin_lock_init(&cc->gpio_lock);
+
         if (cc->core->id.rev >= 11)
                 cc->status = bcma_cc_read32(cc, BCMA_CC_CHIPSTAT);
         cc->capabilities = bcma_cc_read32(cc, BCMA_CC_CAP);
@@ -202,28 +204,97 @@ u32 bcma_chipco_gpio_in(struct bcma_drv_cc *cc, u32 mask)
 
 u32 bcma_chipco_gpio_out(struct bcma_drv_cc *cc, u32 mask, u32 value)
 {
-        return bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUT, mask, value);
+        unsigned long flags;
+        u32 res;
+
+        spin_lock_irqsave(&cc->gpio_lock, flags);
+        res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUT, mask, value);
+        spin_unlock_irqrestore(&cc->gpio_lock, flags);
+
+        return res;
 }
 
 u32 bcma_chipco_gpio_outen(struct bcma_drv_cc *cc, u32 mask, u32 value)
 {
-        return bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUTEN, mask, value);
+        unsigned long flags;
+        u32 res;
+
+        spin_lock_irqsave(&cc->gpio_lock, flags);
+        res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOOUTEN, mask, value);
+        spin_unlock_irqrestore(&cc->gpio_lock, flags);
+
+        return res;
 }
 
+/*
+ * If the bit is set to 0, chipcommon controlls this GPIO,
+ * if the bit is set to 1, it is used by some part of the chip and not our code.
+ */
 u32 bcma_chipco_gpio_control(struct bcma_drv_cc *cc, u32 mask, u32 value)
 {
-        return bcma_cc_write32_masked(cc, BCMA_CC_GPIOCTL, mask, value);
+        unsigned long flags;
+        u32 res;
+
+        spin_lock_irqsave(&cc->gpio_lock, flags);
+        res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOCTL, mask, value);
+        spin_unlock_irqrestore(&cc->gpio_lock, flags);
+
+        return res;
 }
 EXPORT_SYMBOL_GPL(bcma_chipco_gpio_control);
 
 u32 bcma_chipco_gpio_intmask(struct bcma_drv_cc *cc, u32 mask, u32 value)
 {
-        return bcma_cc_write32_masked(cc, BCMA_CC_GPIOIRQ, mask, value);
+        unsigned long flags;
+        u32 res;
+
+        spin_lock_irqsave(&cc->gpio_lock, flags);
+        res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOIRQ, mask, value);
+        spin_unlock_irqrestore(&cc->gpio_lock, flags);
+
+        return res;
 }
 
 u32 bcma_chipco_gpio_polarity(struct bcma_drv_cc *cc, u32 mask, u32 value)
 {
-        return bcma_cc_write32_masked(cc, BCMA_CC_GPIOPOL, mask, value);
+        unsigned long flags;
+        u32 res;
+
+        spin_lock_irqsave(&cc->gpio_lock, flags);
+        res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOPOL, mask, value);
+        spin_unlock_irqrestore(&cc->gpio_lock, flags);
+
+        return res;
+}
+
+u32 bcma_chipco_gpio_pullup(struct bcma_drv_cc *cc, u32 mask, u32 value)
+{
+        unsigned long flags;
+        u32 res;
+
+        if (cc->core->id.rev < 20)
+                return 0;
+
+        spin_lock_irqsave(&cc->gpio_lock, flags);
+        res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOPULLUP, mask, value);
+        spin_unlock_irqrestore(&cc->gpio_lock, flags);
+
+        return res;
+}
+
+u32 bcma_chipco_gpio_pulldown(struct bcma_drv_cc *cc, u32 mask, u32 value)
+{
+        unsigned long flags;
+        u32 res;
+
+        if (cc->core->id.rev < 20)
+                return 0;
+
+        spin_lock_irqsave(&cc->gpio_lock, flags);
+        res = bcma_cc_write32_masked(cc, BCMA_CC_GPIOPULLDOWN, mask, value);
+        spin_unlock_irqrestore(&cc->gpio_lock, flags);
+
+        return res;
 }
 
 #ifdef CONFIG_BCMA_DRIVER_MIPS
diff --git a/drivers/bcma/driver_gpio.c b/drivers/bcma/driver_gpio.c
new file mode 100644
index 000000000000..9a6f585da2d9
--- /dev/null
+++ b/drivers/bcma/driver_gpio.c
@@ -0,0 +1,98 @@
+/*
+ * Broadcom specific AMBA
+ * GPIO driver
+ *
+ * Copyright 2011, Broadcom Corporation
+ * Copyright 2012, Hauke Mehrtens <hauke@hauke-m.de>
+ *
+ * Licensed under the GNU/GPL. See COPYING for details.
+ */
+
+#include <linux/gpio.h>
+#include <linux/export.h>
+#include <linux/bcma/bcma.h>
+
+#include "bcma_private.h"
+
+static inline struct bcma_drv_cc *bcma_gpio_get_cc(struct gpio_chip *chip)
+{
+        return container_of(chip, struct bcma_drv_cc, gpio);
+}
+
+static int bcma_gpio_get_value(struct gpio_chip *chip, unsigned gpio)
+{
+        struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+
+        return !!bcma_chipco_gpio_in(cc, 1 << gpio);
+}
+
+static void bcma_gpio_set_value(struct gpio_chip *chip, unsigned gpio,
+                                int value)
+{
+        struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+
+        bcma_chipco_gpio_out(cc, 1 << gpio, value ? 1 << gpio : 0);
+}
+
+static int bcma_gpio_direction_input(struct gpio_chip *chip, unsigned gpio)
+{
+        struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+
+        bcma_chipco_gpio_outen(cc, 1 << gpio, 0);
+        return 0;
+}
+
+static int bcma_gpio_direction_output(struct gpio_chip *chip, unsigned gpio,
+                                      int value)
+{
+        struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+
+        bcma_chipco_gpio_outen(cc, 1 << gpio, 1 << gpio);
+        bcma_chipco_gpio_out(cc, 1 << gpio, value ? 1 << gpio : 0);
+        return 0;
+}
+
+static int bcma_gpio_request(struct gpio_chip *chip, unsigned gpio)
+{
+        struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+
+        bcma_chipco_gpio_control(cc, 1 << gpio, 0);
+        /* clear pulldown */
+        bcma_chipco_gpio_pulldown(cc, 1 << gpio, 0);
+        /* Set pullup */
+        bcma_chipco_gpio_pullup(cc, 1 << gpio, 1 << gpio);
+
+        return 0;
+}
+
+static void bcma_gpio_free(struct gpio_chip *chip, unsigned gpio)
+{
+        struct bcma_drv_cc *cc = bcma_gpio_get_cc(chip);
+
+        /* clear pullup */
+        bcma_chipco_gpio_pullup(cc, 1 << gpio, 0);
+}
+
+int bcma_gpio_init(struct bcma_drv_cc *cc)
+{
+        struct gpio_chip *chip = &cc->gpio;
+
+        chip->label             = "bcma_gpio";
+        chip->owner             = THIS_MODULE;
+        chip->request           = bcma_gpio_request;
+        chip->free              = bcma_gpio_free;
+        chip->get               = bcma_gpio_get_value;
+        chip->set               = bcma_gpio_set_value;
+        chip->direction_input   = bcma_gpio_direction_input;
+        chip->direction_output  = bcma_gpio_direction_output;
+        chip->ngpio             = 16;
+        /* There is just one SoC in one device and its GPIO addresses should be
+         * deterministic to address them more easily. The other buses could get
+         * a random base number. */
+        if (cc->core->bus->hosttype == BCMA_HOSTTYPE_SOC)
+                chip->base              = 0;
+        else
+                chip->base              = -1;
+
+        return gpiochip_add(chip);
+}
diff --git a/drivers/bcma/main.c b/drivers/bcma/main.c
index debd4f142f93..53ba20ca17e0 100644
--- a/drivers/bcma/main.c
+++ b/drivers/bcma/main.c
@@ -164,6 +164,11 @@ static int bcma_register_cores(struct bcma_bus *bus)
                         bcma_err(bus, "Error registering NAND flash\n");
         }
 #endif
+        err = bcma_gpio_init(&bus->drv_cc);
+        if (err == -ENOTSUPP)
+                bcma_debug(bus, "GPIO driver not activated\n");
+        else if (err)
+                bcma_err(bus, "Error registering GPIO driver: %i\n", err);
 
         if (bus->hosttype == BCMA_HOSTTYPE_SOC) {
                 err = bcma_chipco_watchdog_register(&bus->drv_cc);