summaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-orion/include
diff options
context:
space:
mode:
authorErik Benada2009-05-29 02:08:55 +0200
committerNicolas Pitre2009-06-08 19:04:57 +0200
commita88656553d18c324554855fccc730c9644048111 (patch)
tree6a77d6b11e3f0cf017f6dee21a9934c6c6378704 /arch/arm/plat-orion/include
parent[ARM] Kirkwood: comment type fix (diff)
downloadkernel-qcow2-linux-a88656553d18c324554855fccc730c9644048111.tar.gz
kernel-qcow2-linux-a88656553d18c324554855fccc730c9644048111.tar.xz
kernel-qcow2-linux-a88656553d18c324554855fccc730c9644048111.zip
[ARM] orion: convert gpio to use gpiolib
Signed-off-by: Erik Benada <erikbenada@yahoo.ca> [ nico: fix locking, additional cleanups ] Signed-off-by: Nicolas Pitre <nico@marvell.com>
Diffstat (limited to 'arch/arm/plat-orion/include')
-rw-r--r--arch/arm/plat-orion/include/plat/gpio.h17
1 files changed, 8 insertions, 9 deletions
diff --git a/arch/arm/plat-orion/include/plat/gpio.h b/arch/arm/plat-orion/include/plat/gpio.h
index 33f6c6aec185..9646a94ed3d0 100644
--- a/arch/arm/plat-orion/include/plat/gpio.h
+++ b/arch/arm/plat-orion/include/plat/gpio.h
@@ -14,12 +14,9 @@
/*
* GENERIC_GPIO primitives.
*/
-int gpio_request(unsigned pin, const char *label);
-void gpio_free(unsigned pin);
-int gpio_direction_input(unsigned pin);
-int gpio_direction_output(unsigned pin, int value);
-int gpio_get_value(unsigned pin);
-void gpio_set_value(unsigned pin, int value);
+#define gpio_get_value __gpio_get_value
+#define gpio_set_value __gpio_set_value
+#define gpio_cansleep __gpio_cansleep
/*
* Orion-specific GPIO API extensions.
@@ -27,11 +24,13 @@ void gpio_set_value(unsigned pin, int value);
void orion_gpio_set_unused(unsigned pin);
void orion_gpio_set_blink(unsigned pin, int blink);
-#define GPIO_BIDI_OK (1 << 0)
-#define GPIO_INPUT_OK (1 << 1)
-#define GPIO_OUTPUT_OK (1 << 2)
+#define GPIO_INPUT_OK (1 << 0)
+#define GPIO_OUTPUT_OK (1 << 1)
void orion_gpio_set_valid(unsigned pin, int mode);
+/* Initialize gpiolib. */
+void __init orion_gpio_init(void);
+
/*
* GPIO interrupt handling.
*/