 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
		
			
				
	
	
		
			186 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			186 lines
		
	
	
	
		
			4.2 KiB
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * arch/arm/mach-netx/nxeb500hmi.c
 | |
|  *
 | |
|  * Copyright (c) 2005 Sascha Hauer <s.hauer@pengutronix.de>, Pengutronix
 | |
|  *
 | |
|  * 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.
 | |
|  *
 | |
|  * 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/dma-mapping.h>
 | |
| #include <linux/init.h>
 | |
| #include <linux/interrupt.h>
 | |
| #include <linux/mtd/plat-ram.h>
 | |
| #include <linux/platform_device.h>
 | |
| #include <linux/amba/bus.h>
 | |
| #include <linux/amba/clcd.h>
 | |
| 
 | |
| #include <mach/hardware.h>
 | |
| #include <asm/mach-types.h>
 | |
| #include <asm/mach/arch.h>
 | |
| #include <mach/netx-regs.h>
 | |
| #include <linux/platform_data/eth-netx.h>
 | |
| 
 | |
| #include "generic.h"
 | |
| #include "fb.h"
 | |
| 
 | |
| static struct clcd_panel qvga = {
 | |
| 	.mode		= {
 | |
| 		.name		= "QVGA",
 | |
| 		.refresh	= 60,
 | |
| 		.xres		= 240,
 | |
| 		.yres		= 320,
 | |
| 		.pixclock	= 187617,
 | |
| 		.left_margin	= 6,
 | |
| 		.right_margin	= 26,
 | |
| 		.upper_margin	= 0,
 | |
| 		.lower_margin	= 6,
 | |
| 		.hsync_len	= 6,
 | |
| 		.vsync_len	= 1,
 | |
| 		.sync		= 0,
 | |
| 		.vmode		= FB_VMODE_NONINTERLACED,
 | |
| 	},
 | |
| 	.width		= -1,
 | |
| 	.height		= -1,
 | |
| 	.tim2		=  16,
 | |
| 	.cntl		= CNTL_LCDTFT | CNTL_BGR,
 | |
| 	.bpp		= 16,
 | |
| 	.grayscale	= 0,
 | |
| };
 | |
| 
 | |
| static inline int nxeb500hmi_check(struct clcd_fb *fb, struct fb_var_screeninfo *var)
 | |
| {
 | |
| 	var->green.length = 5;
 | |
| 	var->green.msb_right = 0;
 | |
| 
 | |
| 	return clcdfb_check(fb, var);
 | |
| }
 | |
| 
 | |
| static int nxeb500hmi_clcd_setup(struct clcd_fb *fb)
 | |
| {
 | |
| 	unsigned int val;
 | |
| 
 | |
| 	fb->fb.var.green.length = 5;
 | |
| 	fb->fb.var.green.msb_right = 0;
 | |
| 
 | |
| 	/* enable asic control */
 | |
| 	val = readl(NETX_SYSTEM_IOC_ACCESS_KEY);
 | |
| 	writel(val, NETX_SYSTEM_IOC_ACCESS_KEY);
 | |
| 
 | |
| 	writel(3, NETX_SYSTEM_IOC_CR);
 | |
| 
 | |
| 	/* GPIO 14 is used for display enable on newer boards */
 | |
| 	writel(9, NETX_GPIO_CFG(14));
 | |
| 
 | |
| 	val = readl(NETX_PIO_OUTPIO);
 | |
| 	writel(val | 1, NETX_PIO_OUTPIO);
 | |
| 
 | |
| 	val = readl(NETX_PIO_OEPIO);
 | |
| 	writel(val | 1, NETX_PIO_OEPIO);
 | |
| 	return netx_clcd_setup(fb);
 | |
| }
 | |
| 
 | |
| static struct clcd_board clcd_data = {
 | |
| 	.name		= "netX",
 | |
| 	.check		= nxeb500hmi_check,
 | |
| 	.decode		= clcdfb_decode,
 | |
| 	.enable		= netx_clcd_enable,
 | |
| 	.setup		= nxeb500hmi_clcd_setup,
 | |
| 	.mmap		= netx_clcd_mmap,
 | |
| 	.remove		= netx_clcd_remove,
 | |
| };
 | |
| 
 | |
| static struct netxeth_platform_data eth0_platform_data = {
 | |
| 	.xcno = 0,
 | |
| };
 | |
| 
 | |
| static struct platform_device netx_eth0_device = {
 | |
| 	.name		= "netx-eth",
 | |
| 	.id		= 0,
 | |
| 	.num_resources	= 0,
 | |
| 	.resource	= NULL,
 | |
| 	.dev = {
 | |
| 		.platform_data = ð0_platform_data,
 | |
| 	}
 | |
| };
 | |
| 
 | |
| static struct netxeth_platform_data eth1_platform_data = {
 | |
| 	.xcno = 1,
 | |
| };
 | |
| 
 | |
| static struct platform_device netx_eth1_device = {
 | |
| 	.name		= "netx-eth",
 | |
| 	.id		= 1,
 | |
| 	.num_resources	= 0,
 | |
| 	.resource	= NULL,
 | |
| 	.dev = {
 | |
| 		.platform_data = ð1_platform_data,
 | |
| 	}
 | |
| };
 | |
| 
 | |
| static struct resource netx_cf_resources[] = {
 | |
| 	[0] = {
 | |
| 		.start	= 0x20000000,
 | |
| 		.end	= 0x25ffffff,
 | |
| 		.flags	= IORESOURCE_MEM | IORESOURCE_MEM_8AND16BIT,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct platform_device netx_cf_device = {
 | |
| 	.name		= "netx-cf",
 | |
| 	.id		= 0,
 | |
| 	.resource	= netx_cf_resources,
 | |
| 	.num_resources	= ARRAY_SIZE(netx_cf_resources),
 | |
| };
 | |
| 
 | |
| static struct resource netx_uart0_resources[] = {
 | |
| 	[0] = {
 | |
| 		.start	= 0x00100A00,
 | |
| 		.end	= 0x00100A3F,
 | |
| 		.flags	= IORESOURCE_MEM,
 | |
| 	},
 | |
| 	[1] = {
 | |
| 		.start	= (NETX_IRQ_UART0),
 | |
| 		.end	= (NETX_IRQ_UART0),
 | |
| 		.flags	= IORESOURCE_IRQ,
 | |
| 	},
 | |
| };
 | |
| 
 | |
| static struct platform_device netx_uart0_device = {
 | |
| 	.name		= "netx-uart",
 | |
| 	.id		= 0,
 | |
| 	.num_resources	= ARRAY_SIZE(netx_uart0_resources),
 | |
| 	.resource	= netx_uart0_resources,
 | |
| };
 | |
| 
 | |
| static struct platform_device *devices[] __initdata = {
 | |
| 	&netx_eth0_device,
 | |
| 	&netx_eth1_device,
 | |
| 	&netx_cf_device,
 | |
| 	&netx_uart0_device,
 | |
| };
 | |
| 
 | |
| static void __init nxeb500hmi_init(void)
 | |
| {
 | |
| 	netx_fb_init(&clcd_data, &qvga);
 | |
| 	platform_add_devices(devices, ARRAY_SIZE(devices));
 | |
| }
 | |
| 
 | |
| MACHINE_START(NXEB500HMI, "Hilscher nxeb500hmi")
 | |
| 	.atag_offset	= 0x100,
 | |
| 	.map_io		= netx_map_io,
 | |
| 	.init_irq	= netx_init_irq,
 | |
| 	.init_time	= netx_timer_init,
 | |
| 	.init_machine	= nxeb500hmi_init,
 | |
| 	.restart	= netx_restart,
 | |
| MACHINE_END
 |