 f8060f5446
			
		
	
	
	f8060f5446
	
	
	
		
			
			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
		
			
				
	
	
		
			159 lines
		
	
	
	
		
			4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			159 lines
		
	
	
	
		
			4 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /* linux/arch/arm/mach-s5pv210/mach-smdkc110.c
 | |
|  *
 | |
|  * Copyright (c) 2010 Samsung Electronics Co., Ltd.
 | |
|  *		http://www.samsung.com/
 | |
|  *
 | |
|  * This program is free software; you can redistribute it and/or modify
 | |
|  * it under the terms of the GNU General Public License version 2 as
 | |
|  * published by the Free Software Foundation.
 | |
| */
 | |
| 
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/types.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/serial_core.h>
 | |
| #include <linux/i2c.h>
 | |
| #include <linux/device.h>
 | |
| 
 | |
| #include <asm/mach/arch.h>
 | |
| #include <asm/mach/map.h>
 | |
| #include <asm/setup.h>
 | |
| #include <asm/mach-types.h>
 | |
| 
 | |
| #include <mach/map.h>
 | |
| #include <mach/regs-clock.h>
 | |
| 
 | |
| #include <plat/regs-serial.h>
 | |
| #include <plat/devs.h>
 | |
| #include <plat/cpu.h>
 | |
| #include <linux/platform_data/ata-samsung_cf.h>
 | |
| #include <linux/platform_data/i2c-s3c2410.h>
 | |
| #include <plat/pm.h>
 | |
| #include <plat/s5p-time.h>
 | |
| #include <plat/mfc.h>
 | |
| 
 | |
| #include "common.h"
 | |
| 
 | |
| /* Following are default values for UCON, ULCON and UFCON UART registers */
 | |
| #define SMDKC110_UCON_DEFAULT	(S3C2410_UCON_TXILEVEL |	\
 | |
| 				 S3C2410_UCON_RXILEVEL |	\
 | |
| 				 S3C2410_UCON_TXIRQMODE |	\
 | |
| 				 S3C2410_UCON_RXIRQMODE |	\
 | |
| 				 S3C2410_UCON_RXFIFO_TOI |	\
 | |
| 				 S3C2443_UCON_RXERR_IRQEN)
 | |
| 
 | |
| #define SMDKC110_ULCON_DEFAULT	S3C2410_LCON_CS8
 | |
| 
 | |
| #define SMDKC110_UFCON_DEFAULT	(S3C2410_UFCON_FIFOMODE |	\
 | |
| 				 S5PV210_UFCON_TXTRIG4 |	\
 | |
| 				 S5PV210_UFCON_RXTRIG4)
 | |
| 
 | |
| static struct s3c2410_uartcfg smdkv210_uartcfgs[] __initdata = {
 | |
| 	[0] = {
 | |
| 		.hwport		= 0,
 | |
| 		.flags		= 0,
 | |
| 		.ucon		= SMDKC110_UCON_DEFAULT,
 | |
| 		.ulcon		= SMDKC110_ULCON_DEFAULT,
 | |
| 		.ufcon		= SMDKC110_UFCON_DEFAULT,
 | |
| 	},
 | |
| 	[1] = {
 | |
| 		.hwport		= 1,
 | |
| 		.flags		= 0,
 | |
| 		.ucon		= SMDKC110_UCON_DEFAULT,
 | |
| 		.ulcon		= SMDKC110_ULCON_DEFAULT,
 | |
| 		.ufcon		= SMDKC110_UFCON_DEFAULT,
 | |
| 	},
 | |
| 	[2] = {
 | |
| 		.hwport		= 2,
 | |
| 		.flags		= 0,
 | |
| 		.ucon		= SMDKC110_UCON_DEFAULT,
 | |
| 		.ulcon		= SMDKC110_ULCON_DEFAULT,
 | |
| 		.ufcon		= SMDKC110_UFCON_DEFAULT,
 | |
| 	},
 | |
| 	[3] = {
 | |
| 		.hwport		= 3,
 | |
| 		.flags		= 0,
 | |
| 		.ucon		= SMDKC110_UCON_DEFAULT,
 | |
| 		.ulcon		= SMDKC110_ULCON_DEFAULT,
 | |
| 		.ufcon		= SMDKC110_UFCON_DEFAULT,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct s3c_ide_platdata smdkc110_ide_pdata __initdata = {
 | |
| 	.setup_gpio	= s5pv210_ide_setup_gpio,
 | |
| };
 | |
| 
 | |
| static struct platform_device *smdkc110_devices[] __initdata = {
 | |
| 	&s5pv210_device_iis0,
 | |
| 	&s5pv210_device_ac97,
 | |
| 	&s5pv210_device_spdif,
 | |
| 	&s3c_device_cfcon,
 | |
| 	&s3c_device_i2c0,
 | |
| 	&s3c_device_i2c1,
 | |
| 	&s3c_device_i2c2,
 | |
| 	&s3c_device_rtc,
 | |
| 	&s3c_device_wdt,
 | |
| 	&s5p_device_fimc0,
 | |
| 	&s5p_device_fimc1,
 | |
| 	&s5p_device_fimc2,
 | |
| 	&s5p_device_fimc_md,
 | |
| 	&s5p_device_mfc,
 | |
| 	&s5p_device_mfc_l,
 | |
| 	&s5p_device_mfc_r,
 | |
| };
 | |
| 
 | |
| static struct i2c_board_info smdkc110_i2c_devs0[] __initdata = {
 | |
| 	{ I2C_BOARD_INFO("24c08", 0x50), },     /* Samsung S524AD0XD1 */
 | |
| 	{ I2C_BOARD_INFO("wm8580", 0x1b), },
 | |
| };
 | |
| 
 | |
| static struct i2c_board_info smdkc110_i2c_devs1[] __initdata = {
 | |
| 	/* To Be Updated */
 | |
| };
 | |
| 
 | |
| static struct i2c_board_info smdkc110_i2c_devs2[] __initdata = {
 | |
| 	/* To Be Updated */
 | |
| };
 | |
| 
 | |
| static void __init smdkc110_map_io(void)
 | |
| {
 | |
| 	s5pv210_init_io(NULL, 0);
 | |
| 	s3c24xx_init_clocks(24000000);
 | |
| 	s3c24xx_init_uarts(smdkv210_uartcfgs, ARRAY_SIZE(smdkv210_uartcfgs));
 | |
| 	s5p_set_timer_source(S5P_PWM3, S5P_PWM4);
 | |
| }
 | |
| 
 | |
| static void __init smdkc110_reserve(void)
 | |
| {
 | |
| 	s5p_mfc_reserve_mem(0x43000000, 8 << 20, 0x51000000, 8 << 20);
 | |
| }
 | |
| 
 | |
| static void __init smdkc110_machine_init(void)
 | |
| {
 | |
| 	s3c_pm_init();
 | |
| 
 | |
| 	s3c_i2c0_set_platdata(NULL);
 | |
| 	s3c_i2c1_set_platdata(NULL);
 | |
| 	s3c_i2c2_set_platdata(NULL);
 | |
| 	i2c_register_board_info(0, smdkc110_i2c_devs0,
 | |
| 			ARRAY_SIZE(smdkc110_i2c_devs0));
 | |
| 	i2c_register_board_info(1, smdkc110_i2c_devs1,
 | |
| 			ARRAY_SIZE(smdkc110_i2c_devs1));
 | |
| 	i2c_register_board_info(2, smdkc110_i2c_devs2,
 | |
| 			ARRAY_SIZE(smdkc110_i2c_devs2));
 | |
| 
 | |
| 	s3c_ide_set_platdata(&smdkc110_ide_pdata);
 | |
| 
 | |
| 	platform_add_devices(smdkc110_devices, ARRAY_SIZE(smdkc110_devices));
 | |
| }
 | |
| 
 | |
| MACHINE_START(SMDKC110, "SMDKC110")
 | |
| 	/* Maintainer: Kukjin Kim <kgene.kim@samsung.com> */
 | |
| 	.atag_offset	= 0x100,
 | |
| 	.init_irq	= s5pv210_init_irq,
 | |
| 	.map_io		= smdkc110_map_io,
 | |
| 	.init_machine	= smdkc110_machine_init,
 | |
| 	.init_time	= s5p_timer_init,
 | |
| 	.restart	= s5pv210_restart,
 | |
| 	.reserve	= &smdkc110_reserve,
 | |
| MACHINE_END
 |