Merge git://git.kernel.org/pub/scm/linux/kernel/git/czankel/xtensa-2.6

[sfrench/cifs-2.6.git] / arch / arm / mach-orion5x / include / mach / gpio.h

diff --git a/arch/arm/mach-orion5x/include/mach/gpio.h b/arch/arm/mach-orion5x/include/mach/gpio.h
index 65dc136a86f70e22de74ad1e3d2267498fb2ad42..d8182e87ac16ede59c955ad7108688ea04fcfa85 100644 (file)
--- a/arch/arm/mach-orion5x/include/mach/gpio.h
+++ b/arch/arm/mach-orion5x/include/mach/gpio.h
@@ -2,18 +2,26 @@
  * arch/arm/mach-orion5x/include/mach/gpio.h
  *
  * This file is licensed under the terms of the GNU General Public
- * License version 2. This program is licensed "as is" without any
+ * License version 2.  This program is licensed "as is" without any
  * warranty of any kind, whether express or implied.
  */
 
-extern int gpio_request(unsigned pin, const char *label);
-extern void gpio_free(unsigned pin);
-extern int gpio_direction_input(unsigned pin);
-extern int gpio_direction_output(unsigned pin, int value);
-extern int gpio_get_value(unsigned pin);
-extern void gpio_set_value(unsigned pin, int value);
-extern void orion5x_gpio_set_blink(unsigned pin, int blink);
-extern void gpio_display(void);                /* debug */
+#ifndef __ASM_ARCH_GPIO_H
+#define __ASM_ARCH_GPIO_H
+
+#include <mach/irqs.h>
+#include <plat/gpio.h>
+#include <asm-generic/gpio.h>          /* cansleep wrappers */
+
+#define GPIO_MAX               32
+#define GPIO_OUT(pin)          ORION5X_DEV_BUS_REG(0x100)
+#define GPIO_IO_CONF(pin)      ORION5X_DEV_BUS_REG(0x104)
+#define GPIO_BLINK_EN(pin)     ORION5X_DEV_BUS_REG(0x108)
+#define GPIO_IN_POL(pin)       ORION5X_DEV_BUS_REG(0x10c)
+#define GPIO_DATA_IN(pin)      ORION5X_DEV_BUS_REG(0x110)
+#define GPIO_EDGE_CAUSE(pin)   ORION5X_DEV_BUS_REG(0x114)
+#define GPIO_EDGE_MASK(pin)    ORION5X_DEV_BUS_REG(0x118)
+#define GPIO_LEVEL_MASK(pin)   ORION5X_DEV_BUS_REG(0x11c)
 
 static inline int gpio_to_irq(int pin)
 {
@@ -25,4 +33,5 @@ static inline int irq_to_gpio(int irq)
        return irq - IRQ_ORION5X_GPIO_START;
 }
 
-#include <asm-generic/gpio.h>          /* cansleep wrappers */
+
+#endif