Merge branch 'imx/fix-irqdomain' of git://git.linaro.org/people/shawnguo/linux-2...

diff --cc arch/arm/mach-imx/mach-imx6q.c
index 9cd860a27af5f797cff2b9e5ceaf1798e09e8777,22aa54aa9b2af90b38098997fd276289fa3d92e0..8deb012189b5a7e185f7299a8ad8c8503edad587
--- 1/arch/arm/mach-imx/mach-imx6q.c
--- 2/arch/arm/mach-imx/mach-imx6q.c
+++ b/arch/arm/mach-imx/mach-imx6q.c
@@@ -34,17 -34,17 +34,18 @@@ static void __init imx6q_map_io(void
  {
        imx_lluart_map_io();
        imx_scu_map_io();
 +      imx6q_clock_map_io();
  }
  
- static void __init imx6q_gpio_add_irq_domain(struct device_node *np,
+ static int __init imx6q_gpio_add_irq_domain(struct device_node *np,
                                struct device_node *interrupt_parent)
  {
-       static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS -
-                                  32 * 7; /* imx6q gets 7 gpio ports */
+       static int gpio_irq_base = MXC_GPIO_IRQ_START + ARCH_NR_GPIOS;
  
+       gpio_irq_base -= 32;
        irq_domain_add_simple(np, gpio_irq_base);
-       gpio_irq_base += 32;
+ 
+       return 0;
  }
  
  static const struct of_device_id imx6q_irq_match[] __initconst = {