• Olof Johansson's avatar
    Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/cleanup · f8060f54
    Olof Johansson authored
    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: default avatarOlof 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
    f8060f54
versatile_ab.c 1.38 KB