aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/plat-omap/include/mach/gpio.h
diff options
context:
space:
mode:
authorJarkko Nikula <jarkko.nikula@nokia.com>2008-12-10 17:35:27 -0800
committerTony Lindgren <tony@atomide.com>2008-12-10 17:35:27 -0800
commit3ff164e15574191c69e8406794b0578c8d2a4e23 (patch)
tree66c338c6f8dc7893f7a0e44246191766499e83bf /arch/arm/plat-omap/include/mach/gpio.h
parentARM: OMAP: use gpio_to_irq (diff)
downloadlinux-dev-3ff164e15574191c69e8406794b0578c8d2a4e23.tar.xz
linux-dev-3ff164e15574191c69e8406794b0578c8d2a4e23.zip
ARM: OMAP: make legacy gpio request/free calls superfluous
Clean up OMAP GPIO request/free functions - Rename and declare static OMAP specific GPIO request/free functions - Register them into gpiolib as chip-specific hooks - Add omap_request_gpio/omap_free_gpio wrappers for existing code not converted yet to use gpiolib Signed-off-by: Jarkko Nikula <jarkko.nikula@nokia.com> [ dbrownell@users.sourceforge.net: remove needless check_gpio() calls ] Signed-off-by: David Brownell <dbrownell@users.sourceforge.net> Signed-off-by: Tony Lindgren <tony@atomide.com>
Diffstat (limited to 'arch/arm/plat-omap/include/mach/gpio.h')
-rw-r--r--arch/arm/plat-omap/include/mach/gpio.h12
1 files changed, 10 insertions, 2 deletions
diff --git a/arch/arm/plat-omap/include/mach/gpio.h b/arch/arm/plat-omap/include/mach/gpio.h
index 552ad0c0ac4f..04e68e88f134 100644
--- a/arch/arm/plat-omap/include/mach/gpio.h
+++ b/arch/arm/plat-omap/include/mach/gpio.h
@@ -71,8 +71,6 @@
IH_GPIO_BASE + (nr))
extern int omap_gpio_init(void); /* Call from board init only */
-extern int omap_request_gpio(int gpio);
-extern void omap_free_gpio(int gpio);
extern void omap2_gpio_prepare_for_retention(void);
extern void omap2_gpio_resume_after_retention(void);
extern void omap_set_gpio_debounce(int gpio, int enable);
@@ -89,6 +87,16 @@ extern void omap_set_gpio_debounce_time(int gpio, int enable);
#include <linux/errno.h>
#include <asm-generic/gpio.h>
+static inline int omap_request_gpio(int gpio)
+{
+ return gpio_request(gpio, "FIXME");
+}
+
+static inline void omap_free_gpio(int gpio)
+{
+ gpio_free(gpio);
+}
+
static inline int gpio_get_value(unsigned gpio)
{
return __gpio_get_value(gpio);