3 files changed, 4 insertions, 2 deletions

diff --git a/arch/arm/mach-mxs/include/mach/gpio.h b/arch/arm/mach-mxs/include/mach/gpio.h
index 828ccccb6aad..0a95d58b13f6 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 35a89dd27242..5aa5f754c846 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
diff --git a/drivers/gpio/gpio-mxs.c b/drivers/gpio/gpio-mxs.c
index af55a8577c2e..292b50481db9 100644
--- 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;