1 files changed, 15 insertions, 5 deletions

diff --git a/arch/arm/mach-imx/mach-kzm_arm11_01.c b/arch/arm/mach-imx/mach-kzm_arm11_01.c
index 15a26e908260..5d08533ab2c7 100644
--- a/arch/arm/mach-imx/mach-kzm_arm11_01.c
+++ b/arch/arm/mach-imx/mach-kzm_arm11_01.c
@@ -73,7 +73,7 @@ static struct plat_serial8250_port serial_platform_data[] = {
         {
                 .membase        = KZM_ARM11_IO_ADDRESS(KZM_ARM11_16550),
                 .mapbase        = KZM_ARM11_16550,
-                .irq            = IOMUX_TO_IRQ(MX31_PIN_GPIO1_1),
+                /* irq number is run-time assigned */
                 .irqflags       = IRQ_TYPE_EDGE_RISING,
                 .uartclk        = 14745600,
                 .regshift       = 0,
@@ -91,8 +91,7 @@ static struct resource serial8250_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                .start  = IOMUX_TO_IRQ(MX31_PIN_GPIO1_1),
-                .end    = IOMUX_TO_IRQ(MX31_PIN_GPIO1_1),
+                /* irq number is run-time assigned */
                 .flags  = IORESOURCE_IRQ,
         },
 };
@@ -125,6 +124,13 @@ static int __init kzm_init_ext_uart(void)
         tmp |= 0x2;
         __raw_writeb(tmp, KZM_ARM11_IO_ADDRESS(KZM_ARM11_CTL1));
 
+        serial_platform_data[0].irq =
+                        gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1));
+        serial8250_resources[1].start =
+                        gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1));
+        serial8250_resources[1].end =
+                        gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_1));
+
         return platform_device_register(&serial_device);
 }
 #else
@@ -152,8 +158,7 @@ static struct resource kzm_smsc9118_resources[] = {
                 .flags  = IORESOURCE_MEM,
         },
         {
-                .start  = IOMUX_TO_IRQ(MX31_PIN_GPIO1_2),
-                .end    = IOMUX_TO_IRQ(MX31_PIN_GPIO1_2),
+                /* irq number is run-time assigned */
                 .flags  = IORESOURCE_IRQ | IORESOURCE_IRQ_HIGHEDGE,
         },
 };
@@ -184,6 +189,11 @@ static int __init kzm_init_smsc9118(void)
 
         regulator_register_fixed(0, dummy_supplies, ARRAY_SIZE(dummy_supplies));
 
+        kzm_smsc9118_resources[1].start =
+                        gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2));
+        kzm_smsc9118_resources[1].end =
+                        gpio_to_irq(IOMUX_TO_GPIO(MX31_PIN_GPIO1_2));
+
         return platform_device_register(&kzm_smsc9118_device);
 }
 #else