diff options
| author | Shawn Guo | 2011-08-13 18:14:05 +0200 |
|---|---|---|
| committer | Sascha Hauer | 2011-08-17 08:31:57 +0200 |
| commit | 1dfa86bb9d3fe7581d3182c24a812c8910cbee37 (patch) | |
| tree | 6b2d36cd994c322e5ee4534f3c36a0cb7eed3a73 | |
| parent | gpio/mxc: move irq_to_gpio() into gpio-mxc driver (diff) | |
| download | kernel-qcow2-linux-1dfa86bb9d3fe7581d3182c24a812c8910cbee37.tar.gz kernel-qcow2-linux-1dfa86bb9d3fe7581d3182c24a812c8910cbee37.tar.xz kernel-qcow2-linux-1dfa86bb9d3fe7581d3182c24a812c8910cbee37.zip | |
arm/mxc: move IMX_GPIO_NR into mach/hardware.h
The patch moves IMX_GPIO_NR into mach/hardware.h, so that we only
use standard gpiolib helpers in mach/gpio.h.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/gpio.h | 5 | ||||
| -rw-r--r-- | arch/arm/plat-mxc/include/mach/hardware.h | 4 |
2 files changed, 4 insertions, 5 deletions
diff --git a/arch/arm/plat-mxc/include/mach/gpio.h b/arch/arm/plat-mxc/include/mach/gpio.h index 72c3ed1cddd5..44af0064ba1a 100644 --- a/arch/arm/plat-mxc/include/mach/gpio.h +++ b/arch/arm/plat-mxc/include/mach/gpio.h @@ -23,11 +23,6 @@ #include <mach/hardware.h> #include <asm-generic/gpio.h> - -/* There's a off-by-one betweem the gpio bank number and the gpiochip */ -/* range e.g. GPIO_1_5 is gpio 5 under linux */ -#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 diff --git a/arch/arm/plat-mxc/include/mach/hardware.h b/arch/arm/plat-mxc/include/mach/hardware.h index 77f6556f59a7..f57ec47d6fd5 100644 --- a/arch/arm/plat-mxc/include/mach/hardware.h +++ b/arch/arm/plat-mxc/include/mach/hardware.h @@ -116,6 +116,10 @@ .type = _type, \ } +/* There's a off-by-one betweem the gpio bank number and the gpiochip */ +/* range e.g. GPIO_1_5 is gpio 5 under linux */ +#define IMX_GPIO_NR(bank, nr) (((bank) - 1) * 32 + (nr)) + #define IMX_GPIO_TO_IRQ(gpio) (MXC_GPIO_IRQ_START + (gpio)) #endif /* __ASM_ARCH_MXC_HARDWARE_H__ */ |