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-ks8695 | |
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-ks8695')
-rw-r--r-- | arch/arm/mach-ks8695/include/mach/gpio.h | 11 |
1 files changed, 2 insertions, 9 deletions
diff --git a/arch/arm/mach-ks8695/include/mach/gpio.h b/arch/arm/mach-ks8695/include/mach/gpio.h index 86312d476bc6..c13952c22a39 100644 --- a/arch/arm/mach-ks8695/include/mach/gpio.h +++ b/arch/arm/mach-ks8695/include/mach/gpio.h | |||
@@ -40,17 +40,10 @@ extern int ks8695_gpio_interrupt(unsigned int pin, unsigned int type); | |||
40 | */ | 40 | */ |
41 | extern int irq_to_gpio(unsigned int irq); | 41 | extern int irq_to_gpio(unsigned int irq); |
42 | 42 | ||
43 | #include <asm-generic/gpio.h> | ||
44 | |||
45 | /* If it turns out that we need to optimise GPIO access for the | ||
46 | * Micrel's GPIOs, then these can be changed to check their argument | ||
47 | * directly as static inlines. However for now it's probably not | ||
48 | * worthwhile. | ||
49 | */ | ||
50 | #define gpio_get_value __gpio_get_value | ||
51 | #define gpio_set_value __gpio_set_value | ||
52 | #define gpio_to_irq __gpio_to_irq | 43 | #define gpio_to_irq __gpio_to_irq |
53 | 44 | ||
45 | #define __ARM_GPIOLIB_TRIVIAL | ||
46 | |||
54 | /* Register the GPIOs */ | 47 | /* Register the GPIOs */ |
55 | extern void ks8695_register_gpios(void); | 48 | extern void ks8695_register_gpios(void); |
56 | 49 | ||