2 files changed, 44 insertions, 20 deletions

diff --git a/arch/arm/mach-sa1100/generic.c b/arch/arm/mach-sa1100/generic.c
index e510295c2580..192a5a26cf2b 100644
--- a/arch/arm/mach-sa1100/generic.c
+++ b/arch/arm/mach-sa1100/generic.c
@@ -138,6 +138,36 @@ unsigned long long sched_clock(void)
         return v;
 }
 
+int gpio_direction_input(unsigned gpio)
+{
+        unsigned long flags;
+
+        if (gpio > GPIO_MAX)
+                return -EINVAL;
+
+        local_irq_save(flags);
+        GPDR &= ~GPIO_GPIO(gpio);
+        local_irq_restore(flags);
+        return 0;
+}
+
+EXPORT_SYMBOL(gpio_direction_input);
+
+int gpio_direction_output(unsigned gpio)
+{
+        unsigned long flags;
+
+        if (gpio > GPIO_MAX)
+                return -EINVAL;
+
+        local_irq_save(flags);
+        GPDR |= GPIO_GPIO(gpio);
+        local_irq_restore(flags);
+        return 0;
+}
+
+EXPORT_SYMBOL(gpio_direction_output);
+
 /*
  * Default power-off for SA1100
  */
diff --git a/include/asm-arm/arch-sa1100/gpio.h b/include/asm-arm/arch-sa1100/gpio.h
index a331fe3f6e48..da7575b0e5d0 100644
--- a/include/asm-arm/arch-sa1100/gpio.h
+++ b/include/asm-arm/arch-sa1100/gpio.h
@@ -1,5 +1,5 @@
 /*
- * linux/include/asm-arm/arch-pxa/gpio.h
+ * linux/include/asm-arm/arch-sa1100/gpio.h
  *
  * SA1100 GPIO wrappers for arch-neutral GPIO calls
  *
@@ -24,11 +24,8 @@
 #ifndef __ASM_ARCH_SA1100_GPIO_H
 #define __ASM_ARCH_SA1100_GPIO_H
 
-#include <asm/arch/SA-1100.h>
-#include <asm/arch/irqs.h>
-#include <asm/arch/hardware.h>
-
-#include <asm/errno.h>
+#include <asm/hardware.h>
+#include <asm/irq.h>
 
 static inline int gpio_request(unsigned gpio, const char *label)
 {
@@ -40,26 +37,23 @@ static inline void gpio_free(unsigned gpio)
         return;
 }
 
-static inline int gpio_direction_input(unsigned gpio)
+extern int gpio_direction_input(unsigned gpio);
+extern int gpio_direction_output(unsigned gpio);
+
+
+static inline int gpio_get_value(unsigned gpio)
 {
-        if (gpio > GPIO_MAX)
-                return -EINVAL;
-        GPDR = (GPDR_In << gpio) 0
+        return GPLR & GPIO_GPIO(gpio);
 }
 
-static inline int gpio_direction_output(unsigned gpio)
+static inline void gpio_set_value(unsigned gpio, int value)
 {
-        if (gpio > GPIO_MAX)
-                return -EINVAL;
-        GPDR = (GPDR_Out << gpio) 0
+        if (value)
+                GPSR = GPIO_GPIO(gpio);
+        else
+                GPCR = GPIO_GPIO(gpio);
 }
 
-#define gpio_get_value(gpio) \
-        (GPLR & GPIO_GPIO(gpio))
-
-#define gpio_set_value(gpio,value) \
-        ((value) ? (GPSR = GPIO_GPIO(gpio)) : (GPCR(gpio) = GPIO_GPIO(gpio)))
-
 #include <asm-generic/gpio.h>                   /* cansleep wrappers */
 
 static inline unsigned gpio_to_irq(unsigned gpio)