diff options
| author | Shawn Guo <shawn.guo@linaro.org> | 2011-08-14 00:14:06 +0800 |
|---|---|---|
| committer | Sascha Hauer <s.hauer@pengutronix.de> | 2011-08-17 08:33:02 +0200 |
| commit | 7e6c53aac38eec4e7bca1e4e9a5a6d7e45b30784 (patch) | |
| tree | b7d4e55bd78f9d7d9cd7279a4a10f2b9ca29a9f3 /arch/arm/mach-mxs | |
| parent | 1dfa86bb9d3fe7581d3182c24a812c8910cbee37 (diff) | |
| download | linux-3.10-7e6c53aac38eec4e7bca1e4e9a5a6d7e45b30784.tar.gz linux-3.10-7e6c53aac38eec4e7bca1e4e9a5a6d7e45b30784.tar.bz2 linux-3.10-7e6c53aac38eec4e7bca1e4e9a5a6d7e45b30784.zip | |
gpio/mxs: move irq_to_gpio() into gpio-mxs driver
As irq_to_gpio() is only being used by gpio-mxs driver, it should be
moved from mach/gpio.h into gpio-mxs.c.
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mxs')
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/gpio.h | 2 | ||||
| -rw-r--r-- | arch/arm/mach-mxs/include/mach/mxs.h | 2 |
2 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h index 828ccccb6aa..0a95d58b13f 100644 --- a/arch/arm/mach-mxs/include/mach/gpio.h +++ b/arch/arm/mach-mxs/include/mach/gpio.h @@ -30,6 +30,4 @@ #define gpio_cansleep __gpio_cansleep #define gpio_to_irq __gpio_to_irq -#define irq_to_gpio(irq) ((irq) - MXS_GPIO_IRQ_START) - #endif /* __MACH_MXS_GPIO_H__ */ diff --git a/arch/arm/mach-mxs/include/mach/mxs.h b/arch/arm/mach-mxs/include/mach/mxs.h index 35a89dd2724..5aa5f754c84 100644 --- a/arch/arm/mach-mxs/include/mach/mxs.h +++ b/arch/arm/mach-mxs/include/mach/mxs.h @@ -86,6 +86,8 @@ .type = _type, \ } +#define MXS_GPIO_NR(bank, nr) ((bank) * 32 + (nr)) + #define MXS_SET_ADDR 0x4 #define MXS_CLR_ADDR 0x8 #define MXS_TOG_ADDR 0xc |