ARM: imx: eliminate macro IOMUX_TO_IRQ()

This patch changes all the static gpio irq number assigning with
IOMUX_TO_IRQ() to run-time assigning with gpio_to_irq call, and
in turn eliminates the macro IOMUX_TO_IRQ().

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Acked-by: Sascha Hauer <s.hauer@pengutronix.de>
Acked-by: Dong Aisheng <dong.aisheng@linaro.org>

1 files changed, 5 insertions, 4 deletions

diff --git a/arch/arm/mach-imx/mach-qong.c b/arch/arm/mach-imx/mach-qong.c
index 260621055b6b..b6f11d25f25a 100644
--- a/arch/arm/mach-imx/mach-qong.c
+++ b/arch/arm/mach-imx/mach-qong.c
@@ -51,8 +51,6 @@
         (QONG_FPGA_BASEADDR + QONG_DNET_ID * QONG_FPGA_PERIPH_SIZE)
 #define QONG_DNET_SIZE          0x00001000
 
-#define QONG_FPGA_IRQ           IOMUX_TO_IRQ(MX31_PIN_DTR_DCE1)
-
 static const struct imxuart_platform_data uart_pdata __initconst = {
         .flags = IMXUART_HAVE_RTSCTS,
 };
@@ -78,8 +76,7 @@ static struct resource dnet_resources[] = {
                 .end    = QONG_DNET_BASEADDR + QONG_DNET_SIZE - 1,
                 .flags  = IORESOURCE_MEM,
         }, {
-                .start  = QONG_FPGA_IRQ,
-                .end    = QONG_FPGA_IRQ,
+                /* irq number is run-time assigned */
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -95,6 +92,10 @@ static int __init qong_init_dnet(void)
 {
         int ret;
 
+        dnet_resources[1].start =
+                gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1));
+        dnet_resources[1].end =
+                gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_DTR_DCE1));
         ret = platform_device_register(&dnet_device);
         return ret;
 }