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. -----BEGIN PGP SIGNATURE----- Version: GnuPG v1.4.11 (GNU/Linux) iQEcBAABAgAGBQJQ8ZobAAoJEMhvYp4jgsXiihIH/2VvxmSHZb0e3jN6AR0B42b7 9EwX0IE0B23t91hNTwdzzmTJQYA7pMmWkgHNfd3vIeqSepJAmrVv/gp4iM9CtPwE KNh+kDWOK2ZsOH4Vb0lYRJHN8WQOIQHuCUr9+MdYLNOgf/pPL6G/Y9kv9A1e7fTC W+tFRjC5N1ilZMGyowX12L1wnwDk6kHzed6YV6bskC17cZ9/pg8PhSVbM4A/3kAv NXYKqbXJb+eCsWGXg/knZXOL6V9gBwvVYoe4O9X3nQ0226AWB9caad8l8tchAjRB fmrYF1tbkpOWPnLxhvQy5b5MJichJgTMJHh7RgiEcc/3f63kOljjlx4QKiqHvT0= =q7gm -----END PGP SIGNATURE----- Merge tag 'gic-vic-to-irqchip' of git://sources.calxeda.com/kernel/linux into next/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
		
			
				
	
	
		
			112 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			112 lines
		
	
	
	
		
			2.8 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 *  linux/arch/arm/mach-versatile/versatile_pb.c
 | 
						|
 *
 | 
						|
 *  Copyright (C) 2004 ARM Limited
 | 
						|
 *  Copyright (C) 2000 Deep Blue Solutions Ltd
 | 
						|
 *
 | 
						|
 * This program is free software; you can redistribute it and/or modify
 | 
						|
 * it under the terms of the GNU General Public License as published by
 | 
						|
 * the Free Software Foundation; either version 2 of the License, or
 | 
						|
 * (at your option) any later version.
 | 
						|
 *
 | 
						|
 * This program is distributed in the hope that it will be useful,
 | 
						|
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
 | 
						|
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
 | 
						|
 * GNU General Public License for more details.
 | 
						|
 *
 | 
						|
 * You should have received a copy of the GNU General Public License
 | 
						|
 * along with this program; if not, write to the Free Software
 | 
						|
 * Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA  02111-1307  USA
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/device.h>
 | 
						|
#include <linux/amba/bus.h>
 | 
						|
#include <linux/amba/pl061.h>
 | 
						|
#include <linux/amba/mmci.h>
 | 
						|
#include <linux/io.h>
 | 
						|
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <asm/irq.h>
 | 
						|
#include <asm/mach-types.h>
 | 
						|
 | 
						|
#include <asm/mach/arch.h>
 | 
						|
 | 
						|
#include "core.h"
 | 
						|
 | 
						|
#if 1
 | 
						|
#define IRQ_MMCI1A	IRQ_VICSOURCE23
 | 
						|
#else
 | 
						|
#define IRQ_MMCI1A	IRQ_SIC_MMCI1A
 | 
						|
#endif
 | 
						|
 | 
						|
static struct mmci_platform_data mmc1_plat_data = {
 | 
						|
	.ocr_mask	= MMC_VDD_32_33|MMC_VDD_33_34,
 | 
						|
	.status		= mmc_status,
 | 
						|
	.gpio_wp	= -1,
 | 
						|
	.gpio_cd	= -1,
 | 
						|
};
 | 
						|
 | 
						|
static struct pl061_platform_data gpio2_plat_data = {
 | 
						|
	.gpio_base	= 16,
 | 
						|
	.irq_base	= IRQ_GPIO2_START,
 | 
						|
};
 | 
						|
 | 
						|
static struct pl061_platform_data gpio3_plat_data = {
 | 
						|
	.gpio_base	= 24,
 | 
						|
	.irq_base	= IRQ_GPIO3_START,
 | 
						|
};
 | 
						|
 | 
						|
#define UART3_IRQ	{ IRQ_SIC_UART3 }
 | 
						|
#define SCI1_IRQ	{ IRQ_SIC_SCI3 }
 | 
						|
#define MMCI1_IRQ	{ IRQ_MMCI1A, IRQ_SIC_MMCI1B }
 | 
						|
 | 
						|
/*
 | 
						|
 * These devices are connected via the core APB bridge
 | 
						|
 */
 | 
						|
#define GPIO2_IRQ	{ IRQ_GPIOINT2 }
 | 
						|
#define GPIO3_IRQ	{ IRQ_GPIOINT3 }
 | 
						|
 | 
						|
/*
 | 
						|
 * These devices are connected via the DMA APB bridge
 | 
						|
 */
 | 
						|
 | 
						|
/* FPGA Primecells */
 | 
						|
APB_DEVICE(uart3, "fpga:09", UART3,    NULL);
 | 
						|
APB_DEVICE(sci1,  "fpga:0a", SCI1,     NULL);
 | 
						|
APB_DEVICE(mmc1,  "fpga:0b", MMCI1,    &mmc1_plat_data);
 | 
						|
 | 
						|
/* DevChip Primecells */
 | 
						|
APB_DEVICE(gpio2, "dev:e6",  GPIO2,    &gpio2_plat_data);
 | 
						|
APB_DEVICE(gpio3, "dev:e7",  GPIO3,    &gpio3_plat_data);
 | 
						|
 | 
						|
static struct amba_device *amba_devs[] __initdata = {
 | 
						|
	&uart3_device,
 | 
						|
	&gpio2_device,
 | 
						|
	&gpio3_device,
 | 
						|
	&sci1_device,
 | 
						|
	&mmc1_device,
 | 
						|
};
 | 
						|
 | 
						|
static void __init versatile_pb_init(void)
 | 
						|
{
 | 
						|
	int i;
 | 
						|
 | 
						|
	versatile_init();
 | 
						|
 | 
						|
	for (i = 0; i < ARRAY_SIZE(amba_devs); i++) {
 | 
						|
		struct amba_device *d = amba_devs[i];
 | 
						|
		amba_device_register(d, &iomem_resource);
 | 
						|
	}
 | 
						|
}
 | 
						|
 | 
						|
MACHINE_START(VERSATILE_PB, "ARM-Versatile PB")
 | 
						|
	/* Maintainer: ARM Ltd/Deep Blue Solutions Ltd */
 | 
						|
	.atag_offset	= 0x100,
 | 
						|
	.map_io		= versatile_map_io,
 | 
						|
	.init_early	= versatile_init_early,
 | 
						|
	.init_irq	= versatile_init_irq,
 | 
						|
	.init_time	= versatile_timer_init,
 | 
						|
	.init_machine	= versatile_pb_init,
 | 
						|
	.restart	= versatile_restart,
 | 
						|
MACHINE_END
 |