Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 3645f0cd authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq' of git://git.kernel.org/pub/scm/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()
parents f1d2c07d c7b0807b

arch/arm/Kconfig

+2 −0
Original line number Diff line number Diff line
@@ -470,6 +470,8 @@ config ARCH_MXC 
	select CLKSRC_MMIO

	select GENERIC_IRQ_CHIP

	select MULTI_IRQ_HANDLER

	select SPARSE_IRQ

	select USE_OF

	help

	  Support for Freescale MXC/iMX-based family of processors

arch/arm/include/asm/mach/irq.h

+1 −1
Original line number Diff line number Diff line
@@ -17,7 +17,7 @@ struct seq_file; 
/*

 * This is internal.  Do not use it.

 */

extern void init_FIQ(void);

extern void init_FIQ(int);

extern int show_fiq_list(struct seq_file *, int);



#ifdef CONFIG_MULTI_IRQ_HANDLER

arch/arm/kernel/fiq.c

+6 −3
Original line number Diff line number Diff line
@@ -122,14 +122,16 @@ void release_fiq(struct fiq_handler *f) 
	while (current_fiq->fiq_op(current_fiq->dev_id, 0));

}



static int fiq_start;



void enable_fiq(int fiq)

{

	enable_irq(fiq + FIQ_START);

	enable_irq(fiq + fiq_start);

}



void disable_fiq(int fiq)

{

	disable_irq(fiq + FIQ_START);

	disable_irq(fiq + fiq_start);

}



EXPORT_SYMBOL(set_fiq_handler);
@@ -140,7 +142,8 @@ EXPORT_SYMBOL(release_fiq); 
EXPORT_SYMBOL(enable_fiq);

EXPORT_SYMBOL(disable_fiq);



void __init init_FIQ(void)

void __init init_FIQ(int start)

{

	no_fiq_insn = *(unsigned long *)0xffff001c;

	fiq_start = start;

}

arch/arm/mach-imx/Kconfig

+0 −4
Original line number Diff line number Diff line
@@ -382,7 +382,6 @@ config MACH_IMX27IPCAM 
config MACH_IMX27_DT

	bool "Support i.MX27 platforms from device tree"

	select SOC_IMX27

	select USE_OF

	help

	  Include support for Freescale i.MX27 based platforms

	  using the device tree for discovery
@@ -674,7 +673,6 @@ comment "i.MX51 machines:" 
config MACH_IMX51_DT

	bool "Support i.MX51 platforms from device tree"

	select SOC_IMX51

	select USE_OF

	select MACH_MX51_BABBAGE

	help

	  Include support for Freescale i.MX51 based platforms
@@ -770,7 +768,6 @@ comment "i.MX53 machines:" 
config MACH_IMX53_DT

	bool "Support i.MX53 platforms from device tree"

	select SOC_IMX53

	select USE_OF

	select MACH_MX53_ARD

	select MACH_MX53_EVK

	select MACH_MX53_LOCO
@@ -845,7 +842,6 @@ config SOC_IMX6Q 
	select MFD_ANATOP

	select PINCTRL

	select PINCTRL_IMX6Q

	select USE_OF



	help

	  This enables support for Freescale i.MX6 Quad processor.

arch/arm/mach-imx/devices-imx31.h

+2 −2
Original line number Diff line number Diff line
@@ -42,8 +42,8 @@ extern const struct imx_imx_uart_1irq_data imx31_imx_uart_data[]; 
#define imx31_add_imx_uart4(pdata)	imx31_add_imx_uart(4, pdata)



extern const struct imx_ipu_core_data imx31_ipu_core_data;

#define imx31_add_ipu_core(pdata)	\

	imx_add_ipu_core(&imx31_ipu_core_data, pdata)

#define imx31_add_ipu_core()		\

	imx_add_ipu_core(&imx31_ipu_core_data)

#define imx31_alloc_mx3_camera(pdata)	\

	imx_alloc_mx3_camera(&imx31_ipu_core_data, pdata)

#define imx31_add_mx3_sdc_fb(pdata)	\