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>

diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h
index 828ccccb6aad68dcb7b0e407f898b6d8147b2f98..0a95d58b13f6ec2e3553012508bcf99e9c0bb1ef 100644 (file)
--- 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 35a89dd27242d762d57e3f56b4bce85022fedb53..5aa5f754c846483b84db54ca1b67af03bded2d40 100644 (file)
--- 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

diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index af55a8577c2e110ff08ca872613c8910fc6b636b..292b50481db921d8160f0b97111f51735d7e04b3 100644 (file)
--- a/drivers/gpio/gpio-mxs.c
+++ b/drivers/gpio/gpio-mxs.c
@@ -49,6 +49,8 @@
 #define GPIO_INT_LEV_MASK      (1 << 0)
 #define GPIO_INT_POL_MASK      (1 << 1)
 
+#define irq_to_gpio(irq)       ((irq) - MXS_GPIO_IRQ_START)
+
 struct mxs_gpio_port {
        void __iomem *base;
        int id;