Commit f8060f54 authored Jan 14, 2013 by Olof Johansson

cleanup

From Rob Herring:

Initial irqchip init infrastructure and GIC and VIC clean-ups

This creates irqchip initialization infrastructure from Thomas
Petazzoni. The VIC and GIC irqchip code is moved to drivers/irqchips
and adapted to use the new infrastructure. All DT enabled platforms
using GIC and VIC are converted over to use the new irqchip_init.

* tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux

:
  irqchip: Move ARM vic.h to include/linux/irqchip/arm-vic.h
  ARM: picoxcell: use common irqchip_init function
  ARM: spear: use common irqchip_init function
  irqchip: Move ARM VIC to drivers/irqchip
  ARM: samsung: remove unused tick.h
  ARM: remove unneeded vic.h includes
  ARM: remove mach .handle_irq for VIC users
  ARM: VIC: set handle_arch_irq in VIC initialization
  ARM: VIC: shrink down vic.h
  irqchip: Move ARM gic.h to include/linux/irqchip/arm-gic.h
  ARM: use common irqchip_init for GIC init
  irqchip: Move ARM GIC to drivers/irqchip
  ARM: remove mach .handle_irq for GIC users
  ARM: GIC: set handle_arch_irq in GIC initialization
  ARM: GIC: remove direct use of gic_raise_softirq
  ARM: GIC: remove assembly ifdefs from gic.h
  ARM: mach-ux500: use SGI0 to wake up the other core
  arm: add set_handle_irq() to register the parent IRQ controller handler function
  irqchip: add basic infrastructure
  irqchip: add to the directories part of the IRQ subsystem in MAINTAINERS

Fixed up massive merge conflicts with the timer cleanup due to adjacent changes:

Signed-off-by: Olof Johansson <olof@lixom.net>

Conflicts:
	arch/arm/mach-bcm/board_bcm.c
	arch/arm/mach-cns3xxx/cns3420vb.c
	arch/arm/mach-ep93xx/adssphere.c
	arch/arm/mach-ep93xx/edb93xx.c
	arch/arm/mach-ep93xx/gesbc9312.c
	arch/arm/mach-ep93xx/micro9.c
	arch/arm/mach-ep93xx/simone.c
	arch/arm/mach-ep93xx/snappercl15.c
	arch/arm/mach-ep93xx/ts72xx.c
	arch/arm/mach-ep93xx/vision_ep9307.c
	arch/arm/mach-highbank/highbank.c
	arch/arm/mach-imx/mach-imx6q.c
	arch/arm/mach-msm/board-dt-8960.c
	arch/arm/mach-netx/nxdb500.c
	arch/arm/mach-netx/nxdkn.c
	arch/arm/mach-netx/nxeb500hmi.c
	arch/arm/mach-nomadik/board-nhk8815.c
	arch/arm/mach-picoxcell/common.c
	arch/arm/mach-realview/realview_eb.c
	arch/arm/mach-realview/realview_pb1176.c
	arch/arm/mach-realview/realview_pb11mp.c
	arch/arm/mach-realview/realview_pba8.c
	arch/arm/mach-realview/realview_pbx.c
	arch/arm/mach-socfpga/socfpga.c
	arch/arm/mach-spear13xx/spear1310.c
	arch/arm/mach-spear13xx/spear1340.c
	arch/arm/mach-spear13xx/spear13xx.c
	arch/arm/mach-spear3xx/spear300.c
	arch/arm/mach-spear3xx/spear310.c
	arch/arm/mach-spear3xx/spear320.c
	arch/arm/mach-spear3xx/spear3xx.c
	arch/arm/mach-spear6xx/spear6xx.c
	arch/arm/mach-tegra/board-dt-tegra20.c
	arch/arm/mach-tegra/board-dt-tegra30.c
	arch/arm/mach-u300/core.c
	arch/arm/mach-ux500/board-mop500.c
	arch/arm/mach-ux500/cpu-db8500.c
	arch/arm/mach-versatile/versatile_ab.c
	arch/arm/mach-versatile/versatile_dt.c
	arch/arm/mach-versatile/versatile_pb.c
	arch/arm/mach-vexpress/v2m.c
	include/asm-generic/vmlinux.lds.h

parents 175dbc1e 9e47b8bf

MAINTAINERS

+1 −0

Original line number	Diff line number	Diff line
		@@ -4209,6 +4209,7 @@ M: Thomas Gleixner <tglx@linutronix.de>
		S: Maintained
		T: git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git irq/core
		F: kernel/irq/
		F: drivers/irqchip/

		IRQ DOMAINS (IRQ NUMBER MAPPING LIBRARY)
		M: Benjamin Herrenschmidt <benh@kernel.crashing.org>

arch/arm/common/Kconfig

+0 −23

Original line number	Diff line number	Diff line
		config ARM_GIC
		bool
		select IRQ_DOMAIN
		select MULTI_IRQ_HANDLER

		config GIC_NON_BANKED
		bool

		config ARM_VIC
		bool
		select IRQ_DOMAIN
		select MULTI_IRQ_HANDLER

		config ARM_VIC_NR
		int
		default 4 if ARCH_S5PV210
		default 3 if ARCH_S5PC100
		default 2
		depends on ARM_VIC
		help
		The maximum number of VICs available in the system, for
		power management.

		config ICST
		bool

arch/arm/common/Makefile

+0 −2

Original line number	Diff line number	Diff line
		@@ -2,8 +2,6 @@
		# Makefile for the linux kernel.
		#

		obj-$(CONFIG_ARM_GIC) += gic.o
		obj-$(CONFIG_ARM_VIC) += vic.o
		obj-$(CONFIG_ICST) += icst.o
		obj-$(CONFIG_SA1111) += sa1111.o
		obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o

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

+1 −0

Original line number	Diff line number	Diff line
		@@ -22,6 +22,7 @@ extern int show_fiq_list(struct seq_file *, int);

		#ifdef CONFIG_MULTI_IRQ_HANDLER
		extern void (handle_arch_irq)(struct pt_regs );
		extern void set_handle_irq(void (handle_irq)(struct pt_regs ));
		#endif

		/*

arch/arm/kernel/irq.c

+10 −0

Original line number	Diff line number	Diff line
		@@ -117,6 +117,16 @@ void __init init_IRQ(void)
		machine_desc->init_irq();
		}

		#ifdef CONFIG_MULTI_IRQ_HANDLER
		void __init set_handle_irq(void (handle_irq)(struct pt_regs ))
		{
		if (handle_arch_irq)
		return;

		handle_arch_irq = handle_irq;
		}
		#endif

		#ifdef CONFIG_SPARSE_IRQ
		int __init arch_probe_nr_irqs(void)
		{