Same as the previous patch, submitting it now as I don't want to miss
the 2.6.24 merge window.
Add GPIO support to the BCM947xx platform. It will be used by a GPIO
LED driver.
Signed-off-by: Aurelien Jarno <aurelien@xxxxxxxxxxx>
--- a/arch/mips/bcm947xx/gpio.c
+++ b/arch/mips/bcm947xx/gpio.c
@@ -0,0 +1,79 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Aurelien Jarno <aurelien@xxxxxxxxxxx>
+ */
+
+#include <linux/ssb/ssb.h>
+#include <linux/ssb/ssb_driver_chipcommon.h>
+#include <linux/ssb/ssb_driver_extif.h>
+#include <asm/mach-bcm947xx/bcm947xx.h>
+#include <asm/mach-bcm947xx/gpio.h>
+
+int bcm947xx_gpio_to_irq(unsigned gpio)
+{
+ if (ssb_bcm947xx.chipco.dev)
+ return ssb_mips_irq(ssb_bcm947xx.chipco.dev) + 2;
+ else if (ssb_bcm947xx.extif.dev)
+ return ssb_mips_irq(ssb_bcm947xx.extif.dev) + 2;
+ else
+ return -EINVAL;
+}
+EXPORT_SYMBOL(bcm947xx_gpio_to_irq);
+
+int bcm947xx_gpio_get_value(unsigned gpio)
+{
+ if (ssb_bcm947xx.chipco.dev)
+ return ssb_chipco_gpio_in(&ssb_bcm947xx.chipco, 1 << gpio);
+ else if (ssb_bcm947xx.extif.dev)
+ return ssb_extif_gpio_in(&ssb_bcm947xx.extif, 1 << gpio);
+ else
+ return 0;
+}
+EXPORT_SYMBOL(bcm947xx_gpio_get_value);
+
+void bcm947xx_gpio_set_value(unsigned gpio, int value)
+{
+ if (ssb_bcm947xx.chipco.dev)
+ ssb_chipco_gpio_out(&ssb_bcm947xx.chipco,
+ 1 << gpio,
+ value ? 1 << gpio : 0);
+ else if (ssb_bcm947xx.extif.dev)
+ ssb_extif_gpio_out(&ssb_bcm947xx.extif,
+ 1 << gpio,
+ value ? 1 << gpio : 0);
+}
+EXPORT_SYMBOL(bcm947xx_gpio_set_value);
+
+int bcm947xx_gpio_direction_input(unsigned gpio)
+{
+ if (ssb_bcm947xx.chipco.dev && (gpio < BCM947XX_CHIPCO_GPIO_LINES))
+ ssb_chipco_gpio_outen(&ssb_bcm947xx.chipco,
+ 1 << gpio, 0);
+ else if (ssb_bcm947xx.extif.dev && (gpio < BCM947XX_EXTIF_GPIO_LINES))
+ ssb_extif_gpio_outen(&ssb_bcm947xx.extif,
+ 1 << gpio, 0);
+ else
+ return -EINVAL;
+ return 0;
+}
+EXPORT_SYMBOL(bcm947xx_gpio_direction_input);
+
+int bcm947xx_gpio_direction_output(unsigned gpio, int value)
+{
+ bcm947xx_gpio_set_value(gpio, value);
+
+ if (ssb_bcm947xx.chipco.dev && (gpio < BCM947XX_CHIPCO_GPIO_LINES))
+ ssb_chipco_gpio_outen(&ssb_bcm947xx.chipco,
+ 1 << gpio, 1 << gpio);
+ else if (ssb_bcm947xx.extif.dev && (gpio < BCM947XX_EXTIF_GPIO_LINES))
+ ssb_extif_gpio_outen(&ssb_bcm947xx.extif,
+ 1 << gpio, 1 << gpio);
+ else
+ return -EINVAL;
+ return 0;
+}
+EXPORT_SYMBOL(bcm947xx_gpio_direction_output);
+
--- a/arch/mips/bcm947xx/Makefile
+++ b/arch/mips/bcm947xx/Makefile
@@ -3,4 +3,4 @@
# under Linux.
#
-obj-y := irq.o prom.o serial.o setup.o time.o
+obj-y := gpio.o irq.o prom.o serial.o setup.o time.o
--- a/include/asm-mips/mach-bcm947xx/gpio.h
+++ b/include/asm-mips/mach-bcm947xx/gpio.h
@@ -0,0 +1,59 @@
+/*
+ * This file is subject to the terms and conditions of the GNU General Public
+ * License. See the file "COPYING" in the main directory of this archive
+ * for more details.
+ *
+ * Copyright (C) 2007 Aurelien Jarno <aurelien@xxxxxxxxxxx>
+ */
+
+#ifndef __BCM947XX_GPIO_H
+#define __BCM947XX_GPIO_H
+
+#define BCM947XX_EXTIF_GPIO_LINES 5
+#define BCM947XX_CHIPCO_GPIO_LINES 16
+
+extern int bcm947xx_gpio_to_irq(unsigned gpio);
+extern int bcm947xx_gpio_get_value(unsigned gpio);
+extern void bcm947xx_gpio_set_value(unsigned gpio, int value);
+extern int bcm947xx_gpio_direction_input(unsigned gpio);
+extern int bcm947xx_gpio_direction_output(unsigned gpio, int value);
+
+static inline int gpio_request(unsigned gpio, const char *label)
+{
+ return 0;
+}
+
+static inline void gpio_free(unsigned gpio)
+{
+}
+
+static inline int gpio_to_irq(unsigned gpio)
+{
+ return bcm947xx_gpio_to_irq(gpio);
+}
+
+static inline int gpio_get_value(unsigned gpio)
+{
+ return bcm947xx_gpio_get_value(gpio);
+}
+
+static inline void gpio_set_value(unsigned gpio, int value)
+{
+ bcm947xx_gpio_set_value(gpio, value);
+}
+
+static inline int gpio_direction_input(unsigned gpio)
+{
+ return bcm947xx_gpio_direction_input(gpio);
+}
+
+static inline int gpio_direction_output(unsigned gpio, int value)
+{
+ return bcm947xx_gpio_direction_output(gpio, value);
+}
+
+
+/* cansleep wrappers */
+#include <asm-generic/gpio.h>
+
+#endif /* __BCM947XX_GPIO_H */
--
.''`. Aurelien Jarno | GPG: 1024D/F1BCDB73
: :' : Debian developer | Electrical Engineer
`. `' aurel32@xxxxxxxxxx | aurelien@xxxxxxxxxxx
`- people.debian.org/~aurel32 | www.aurel32.net
