diff options
| author | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-07-26 11:04:51 +0100 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2011-08-12 08:53:15 +0100 |
| commit | 22fe67837614469f8e86c97e9e43d46270701b33 (patch) | |
| tree | 8823ecf3f60aa0c40b9e2d997875d565445261fa /arch/arm/plat-mxc/include/mach/gpio.h | |
| parent | 50ac01fbd29ba208d0cd4cb9467d3ffc07ae834a (diff) | |
| download | blackbird-op-linux-22fe67837614469f8e86c97e9e43d46270701b33.tar.gz blackbird-op-linux-22fe67837614469f8e86c97e9e43d46270701b33.zip | |
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-mxc/include/mach/gpio.h')
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 5 |
1 files changed, 1 insertions, 4 deletions
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 31c820c1b796..4398edd03780 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h @@ -21,7 +21,6 @@ #include <linux/spinlock.h> #include <mach/hardware.h> -#include <asm-generic/gpio.h> /* There's a off-by-one betweem the gpio bank number and the gpiochip */ @@ -29,9 +28,7 @@ #define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) /* use gpiolib dispatchers */ -#define gpio_get_value __gpio_get_value -#define gpio_set_value __gpio_set_value -#define gpio_cansleep __gpio_cansleep +#define __ARM_GPIOLIB_TRIVIAL #define gpio_to_irq(gpio) (MXC_GPIO_IRQ_START + (gpio)) #define irq_to_gpio(irq) ((irq) - MXC_GPIO_IRQ_START) |
