From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Tue, 24 Jul 2012 00:36:02 +0000 (-0700)
Subject: Merge tag 'irq' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc
X-Git-Tag: v3.6~382
X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=3645f0cd96fbf72c614673c5f4b1a8675f82a379;p=platform%2Fkernel%2Flinux-amlogic.git

Merge tag 'irq' of git://git./linux/kernel/git/arm/arm-soc

Pull arm-soc sparse IRQ conversion from Arnd Bergmann:
 "The I.MX platform is getting converted to use sparse IRQs.  We are
  doing this for all platforms over time, because this is one of the
  requirements for building a multiplatform kernel, and generally a good
  idea."

* tag 'irq' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: imx: select USE_OF
  ARM: imx: Fix build error due to missing irqs.h include
  ARM: imx: enable SPARSE_IRQ for imx platform
  ARM: fiq: change FIQ_START to a variable
  tty: serial: imx: remove the use of MXC_INTERNAL_IRQS
  ARM: imx: remove unneeded mach/irq.h inclusion
  i2c: imx: remove unneeded mach/irqs.h inclusion
  ARM: imx: add a legacy irqdomain for mx31ads
  ARM: imx: add a legacy irqdomain for 3ds_debugboard
  ARM: imx: pass gpio than irq number into mxc_expio_init
  ARM: imx: leave irq_base of wm8350_platform_data uninitialized
  dma: ipu: remove the use of ipu_platform_data
  ARM: imx: move irq_domain_add_legacy call into avic driver
  ARM: imx: move irq_domain_add_legacy call into tzic driver
  gpio/mxc: move irq_domain_add_legacy call into gpio driver
  ARM: imx: eliminate macro IRQ_GPIOx()
  ARM: imx: eliminate macro IOMUX_TO_IRQ()
  ARM: imx: eliminate macro IMX_GPIO_TO_IRQ()
---

3645f0cd96fbf72c614673c5f4b1a8675f82a379
diff --cc arch/arm/mach-imx/Kconfig
index 7616101,935f843..afd542a
--- a/arch/arm/mach-imx/Kconfig
+++ b/arch/arm/mach-imx/Kconfig
@@@ -842,10 -827,8 +839,9 @@@ config SOC_IMX6
  	select HAVE_IMX_MMDC
  	select HAVE_IMX_SRC
  	select HAVE_SMP
 +	select MFD_ANATOP
  	select PINCTRL
  	select PINCTRL_IMX6Q
- 	select USE_OF
  
  	help
  	  This enables support for Freescale i.MX6 Quad processor.
diff --cc arch/arm/mach-imx/mach-imx27_visstrim_m10.c
index ba09552,d566a37..f264ddd
--- a/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
+++ b/arch/arm/mach-imx/mach-imx27_visstrim_m10.c
@@@ -38,8 -38,9 +38,9 @@@
  #include <asm/mach-types.h>
  #include <asm/mach/arch.h>
  #include <asm/mach/time.h>
 -#include <asm/system.h>
 +#include <asm/system_info.h>
  #include <mach/common.h>
+ #include <mach/hardware.h>
  #include <mach/iomux-mx27.h>
  
  #include "devices-imx27.h"
diff --cc arch/arm/mach-imx/mach-mx31_3ds.c
index 928e1dc,f37d9b5..8915f93
--- a/arch/arm/mach-imx/mach-mx31_3ds.c
+++ b/arch/arm/mach-imx/mach-mx31_3ds.c
@@@ -736,10 -730,10 +730,10 @@@ static void __init mx31_3ds_init(void
  	if (!otg_mode_host)
  		imx31_add_fsl_usb2_udc(&usbotg_pdata);
  
- 	if (mxc_expio_init(MX31_CS5_BASE_ADDR, EXPIO_PARENT_INT))
+ 	if (mxc_expio_init(MX31_CS5_BASE_ADDR, IOMUX_TO_GPIO(MX31_PIN_GPIO1_1)))
  		printk(KERN_WARNING "Init of the debug board failed, all "
  				    "devices on the debug board are unusable.\n");
 -	imx31_add_imx2_wdt(NULL);
 +	imx31_add_imx2_wdt();
  	imx31_add_imx_i2c0(&mx31_3ds_i2c0_data);
  	imx31_add_mxc_mmc(0, &sdhc1_pdata);