diff options
author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-26 06:04:51 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-12 03:53:15 -0400 |
commit | 22fe67837614469f8e86c97e9e43d46270701b33 (patch) | |
tree | 8823ecf3f60aa0c40b9e2d997875d565445261fa /arch/arm/plat-nomadik | |
parent | 50ac01fbd29ba208d0cd4cb9467d3ffc07ae834a (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/plat-nomadik')
-rw-r--r-- | arch/arm/plat-nomadik/include/plat/gpio.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/plat-nomadik/include/plat/gpio.h b/arch/arm/plat-nomadik/include/plat/gpio.h index d5d7e651269c..c804c3474c85 100644 --- a/arch/arm/plat-nomadik/include/plat/gpio.h +++ b/arch/arm/plat-nomadik/include/plat/gpio.h | |||
@@ -12,16 +12,9 @@ | |||
12 | #ifndef __ASM_PLAT_GPIO_H | 12 | #ifndef __ASM_PLAT_GPIO_H |
13 | #define __ASM_PLAT_GPIO_H | 13 | #define __ASM_PLAT_GPIO_H |
14 | 14 | ||
15 | #include <asm-generic/gpio.h> | 15 | #include <linux/kernel.h> |
16 | 16 | ||
17 | /* | 17 | #define __ARM_GPIOLIB_TRIVIAL |
18 | * These currently cause a function call to happen, they may be optimized | ||
19 | * if needed by adding cpu-specific defines to identify blocks | ||
20 | * (see mach-pxa/include/mach/gpio.h as an example using GPLR etc) | ||
21 | */ | ||
22 | #define gpio_get_value __gpio_get_value | ||
23 | #define gpio_set_value __gpio_set_value | ||
24 | #define gpio_cansleep __gpio_cansleep | ||
25 | #define gpio_to_irq __gpio_to_irq | 18 | #define gpio_to_irq __gpio_to_irq |
26 | 19 | ||
27 | /* | 20 | /* |