From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 6 Dec 2011 14:15:02 +0000 (+0000)
Subject: Merge branch 'imx/fix-irqdomain' of git://git.linaro.org/people/shawnguo/linux-2... 
X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fec607aab5dca019cfc76768fa0b5908d47a55b1;p=GitHub%2Fmt8127%2Fandroid_kernel_alcatel_ttab.git

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

fec607aab5dca019cfc76768fa0b5908d47a55b1
diff --cc arch/arm/mach-imx/mach-imx6q.c
index 9cd860a27af5,22aa54aa9b2a..8deb012189b5
--- a/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 = {