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
		
			
				
	
	
		
			89 lines
		
	
	
	
		
			2.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			89 lines
		
	
	
	
		
			2.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
/*
 | 
						|
 * arch/arm/mach-ep93xx/simone.c
 | 
						|
 * Simplemachines Sim.One support.
 | 
						|
 *
 | 
						|
 * Copyright (C) 2010 Ryan Mallon
 | 
						|
 *
 | 
						|
 * Based on the 2.6.24.7 support:
 | 
						|
 *   Copyright (C) 2009 Simplemachines
 | 
						|
 *   MMC support by Peter Ivanov <ivanovp@gmail.com>, 2007
 | 
						|
 *
 | 
						|
 * 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.
 | 
						|
 *
 | 
						|
 */
 | 
						|
 | 
						|
#include <linux/kernel.h>
 | 
						|
#include <linux/init.h>
 | 
						|
#include <linux/platform_device.h>
 | 
						|
#include <linux/i2c.h>
 | 
						|
#include <linux/i2c-gpio.h>
 | 
						|
 | 
						|
#include <mach/hardware.h>
 | 
						|
#include <linux/platform_data/video-ep93xx.h>
 | 
						|
#include <mach/gpio-ep93xx.h>
 | 
						|
 | 
						|
#include <asm/mach-types.h>
 | 
						|
#include <asm/mach/arch.h>
 | 
						|
 | 
						|
#include "soc.h"
 | 
						|
 | 
						|
static struct ep93xx_eth_data __initdata simone_eth_data = {
 | 
						|
	.phy_id		= 1,
 | 
						|
};
 | 
						|
 | 
						|
static struct ep93xxfb_mach_info __initdata simone_fb_info = {
 | 
						|
	.num_modes	= EP93XXFB_USE_MODEDB,
 | 
						|
	.bpp		= 16,
 | 
						|
	.flags		= EP93XXFB_USE_SDCSN0 | EP93XXFB_PCLK_FALLING,
 | 
						|
};
 | 
						|
 | 
						|
static struct i2c_gpio_platform_data __initdata simone_i2c_gpio_data = {
 | 
						|
	.sda_pin		= EP93XX_GPIO_LINE_EEDAT,
 | 
						|
	.sda_is_open_drain	= 0,
 | 
						|
	.scl_pin		= EP93XX_GPIO_LINE_EECLK,
 | 
						|
	.scl_is_open_drain	= 0,
 | 
						|
	.udelay			= 0,
 | 
						|
	.timeout		= 0,
 | 
						|
};
 | 
						|
 | 
						|
static struct i2c_board_info __initdata simone_i2c_board_info[] = {
 | 
						|
	{
 | 
						|
		I2C_BOARD_INFO("ds1337", 0x68),
 | 
						|
	},
 | 
						|
};
 | 
						|
 | 
						|
static struct platform_device simone_audio_device = {
 | 
						|
	.name		= "simone-audio",
 | 
						|
	.id		= -1,
 | 
						|
};
 | 
						|
 | 
						|
static void __init simone_register_audio(void)
 | 
						|
{
 | 
						|
	ep93xx_register_ac97();
 | 
						|
	platform_device_register(&simone_audio_device);
 | 
						|
}
 | 
						|
 | 
						|
static void __init simone_init_machine(void)
 | 
						|
{
 | 
						|
	ep93xx_init_devices();
 | 
						|
	ep93xx_register_flash(2, EP93XX_CS6_PHYS_BASE, SZ_8M);
 | 
						|
	ep93xx_register_eth(&simone_eth_data, 1);
 | 
						|
	ep93xx_register_fb(&simone_fb_info);
 | 
						|
	ep93xx_register_i2c(&simone_i2c_gpio_data, simone_i2c_board_info,
 | 
						|
			    ARRAY_SIZE(simone_i2c_board_info));
 | 
						|
	simone_register_audio();
 | 
						|
}
 | 
						|
 | 
						|
MACHINE_START(SIM_ONE, "Simplemachines Sim.One Board")
 | 
						|
	/* Maintainer: Ryan Mallon */
 | 
						|
	.atag_offset	= 0x100,
 | 
						|
	.map_io		= ep93xx_map_io,
 | 
						|
	.init_irq	= ep93xx_init_irq,
 | 
						|
	.init_time	= ep93xx_timer_init,
 | 
						|
	.init_machine	= simone_init_machine,
 | 
						|
	.init_late	= ep93xx_init_late,
 | 
						|
	.restart	= ep93xx_restart,
 | 
						|
MACHINE_END
 |