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/mach-s5pv210/include/mach | |
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/mach-s5pv210/include/mach')
-rw-r--r-- | arch/arm/mach-s5pv210/include/mach/gpio.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-s5pv210/include/mach/gpio.h b/arch/arm/mach-s5pv210/include/mach/gpio.h index a5a1e331f8ed..27f2139df311 100644 --- a/arch/arm/mach-s5pv210/include/mach/gpio.h +++ b/arch/arm/mach-s5pv210/include/mach/gpio.h | |||
@@ -13,9 +13,7 @@ | |||
13 | #ifndef __ASM_ARCH_GPIO_H | 13 | #ifndef __ASM_ARCH_GPIO_H |
14 | #define __ASM_ARCH_GPIO_H __FILE__ | 14 | #define __ASM_ARCH_GPIO_H __FILE__ |
15 | 15 | ||
16 | #define gpio_get_value __gpio_get_value | 16 | #define __ARM_GPIOLIB_TRIVIAL |
17 | #define gpio_set_value __gpio_set_value | ||
18 | #define gpio_cansleep __gpio_cansleep | ||
19 | #define gpio_to_irq __gpio_to_irq | 17 | #define gpio_to_irq __gpio_to_irq |
20 | 18 | ||
21 | /* Practically, GPIO banks up to MP03 are the configurable gpio banks */ | 19 | /* Practically, GPIO banks up to MP03 are the configurable gpio banks */ |
@@ -142,6 +140,4 @@ enum s5p_gpio_number { | |||
142 | #define ARCH_NR_GPIOS (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + \ | 140 | #define ARCH_NR_GPIOS (S5PV210_MP05(S5PV210_GPIO_MP05_NR) + \ |
143 | CONFIG_SAMSUNG_GPIO_EXTRA + 1) | 141 | CONFIG_SAMSUNG_GPIO_EXTRA + 1) |
144 | 142 | ||
145 | #include <asm-generic/gpio.h> | ||
146 | |||
147 | #endif /* __ASM_ARCH_GPIO_H */ | 143 | #endif /* __ASM_ARCH_GPIO_H */ |