aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-lpc32xx
diff options
context:
space:
mode:
authorRussell King <rmk+kernel@arm.linux.org.uk>2011-07-26 06:04:51 -0400
committerRussell King <rmk+kernel@arm.linux.org.uk>2011-08-12 03:53:15 -0400
commit22fe67837614469f8e86c97e9e43d46270701b33 (patch)
tree8823ecf3f60aa0c40b9e2d997875d565445261fa /arch/arm/mach-lpc32xx
parent50ac01fbd29ba208d0cd4cb9467d3ffc07ae834a (diff)
ARM: gpio: consolidate trivial gpiolib implementations
Consolidate 24 trivial gpiolib implementions out of mach/gpio.h into asm/gpio.h. This is basically the include of asm-generic/gpio.h and the definition of gpio_get_value, gpio_set_value, and gpio_cansleep as described in Documentation/gpio.txt Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Tested-by: David Brown <davidb@codeaurora.org> Acked-by: David Brown <davidb@codeaurora.org> Tested-by: Linus Walleij <linus.walleij@linaro.org> Acked-by: Kukjin Kim <kgene.kim@samsung.com> Tested-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-lpc32xx')
-rw-r--r--arch/arm/mach-lpc32xx/include/mach/gpio.h17
1 files changed, 1 insertions, 16 deletions
diff --git a/arch/arm/mach-lpc32xx/include/mach/gpio.h b/arch/arm/mach-lpc32xx/include/mach/gpio.h
index 67d03da1eee9..0ca6c2778aa7 100644
--- a/arch/arm/mach-lpc32xx/include/mach/gpio.h
+++ b/arch/arm/mach-lpc32xx/include/mach/gpio.h
@@ -19,8 +19,6 @@
19#ifndef __ASM_ARCH_GPIO_H 19#ifndef __ASM_ARCH_GPIO_H
20#define __ASM_ARCH_GPIO_H 20#define __ASM_ARCH_GPIO_H
21 21
22#include <asm-generic/gpio.h>
23
24/* 22/*
25 * Note! 23 * Note!
26 * Muxed GP pins need to be setup to the GP state in the board level 24 * Muxed GP pins need to be setup to the GP state in the board level
@@ -51,20 +49,7 @@
51 */ 49 */
52#define LPC32XX_GPIO(x, y) ((x) + (y)) 50#define LPC32XX_GPIO(x, y) ((x) + (y))
53 51
54static inline int gpio_get_value(unsigned gpio) 52#define __ARM_GPIOLIB_TRIVIAL
55{
56 return __gpio_get_value(gpio);
57}
58
59static inline void gpio_set_value(unsigned gpio, int value)
60{
61 __gpio_set_value(gpio, value);
62}
63
64static inline int gpio_cansleep(unsigned gpio)
65{
66 return __gpio_cansleep(gpio);
67}
68 53
69static inline int gpio_to_irq(unsigned gpio) 54static inline int gpio_to_irq(unsigned gpio)
70{ 55{