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-mxs | |
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-mxs')
-rw-r--r-- | arch/arm/mach-mxs/include/mach/gpio.h | 6 |
1 files changed, 1 insertions, 5 deletions
diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h index 828ccccb6aad..bb44c8dcf31c 100644 --- a/arch/arm/mach-mxs/include/mach/gpio.h +++ b/arch/arm/mach-mxs/include/mach/gpio.h | |||
@@ -20,14 +20,10 @@ | |||
20 | #ifndef __MACH_MXS_GPIO_H__ | 20 | #ifndef __MACH_MXS_GPIO_H__ |
21 | #define __MACH_MXS_GPIO_H__ | 21 | #define __MACH_MXS_GPIO_H__ |
22 | 22 | ||
23 | #include <asm-generic/gpio.h> | ||
24 | |||
25 | #define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr)) | 23 | #define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr)) |
26 | 24 | ||
27 | /* use gpiolib dispatchers */ | 25 | /* use gpiolib dispatchers */ |
28 | #define gpio_get_value __gpio_get_value | 26 | #define __ARM_GPIOLIB_TRIVIAL |
29 | #define gpio_set_value __gpio_set_value | ||
30 | #define gpio_cansleep __gpio_cansleep | ||
31 | #define gpio_to_irq __gpio_to_irq | 27 | #define gpio_to_irq __gpio_to_irq |
32 | 28 | ||
33 | #define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START) | 29 | #define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START) |