summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-stm/include/mach/gpio.h
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2011-01-06 11:26:18 +0100
committerSascha Hauer <s.hauer@pengutronix.de>2011-01-06 11:26:18 +0100
commitf39d4d225ebdfdf5c2435e9895355c6b5fc74973 (patch)
treeffbbe92109e7323d43a6c18503a5f0a904fc0c2f /arch/arm/mach-stm/include/mach/gpio.h
parentd836124f8bbe05843a3f954727e6544a0fb96013 (diff)
parentd4d7a192587bb25051dbc845aab45301d22e6ed3 (diff)
downloadbarebox-f39d4d225ebdfdf5c2435e9895355c6b5fc74973.tar.gz
barebox-f39d4d225ebdfdf5c2435e9895355c6b5fc74973.tar.xz
Merge branch 'next'
Diffstat (limited to 'arch/arm/mach-stm/include/mach/gpio.h')
-rw-r--r--arch/arm/mach-stm/include/mach/gpio.h11
1 files changed, 10 insertions, 1 deletions
diff --git a/arch/arm/mach-stm/include/mach/gpio.h b/arch/arm/mach-stm/include/mach/gpio.h
index fa8263cc95..c419926214 100644
--- a/arch/arm/mach-stm/include/mach/gpio.h
+++ b/arch/arm/mach-stm/include/mach/gpio.h
@@ -20,10 +20,19 @@
#ifndef __ASM_MACH_GPIO_H
#define __ASM_MACH_GPIO_H
+#include <types.h>
+
#if defined CONFIG_ARCH_IMX23
# include <mach/iomux-imx23.h>
#endif
+#if defined CONFIG_ARCH_IMX28
+# include <mach/iomux-imx28.h>
+#endif
-void imx_gpio_mode(unsigned);
+void imx_gpio_mode(uint32_t);
+void gpio_set_value(unsigned, int);
+int gpio_direction_input(unsigned);
+int gpio_direction_output(unsigned, int);
+int gpio_get_value(unsigned);
#endif /* __ASM_MACH_GPIO_H */