 0d601f613b
			
		
	
	
	0d601f613b
	
	
	
		
			
			* 'kirkwood/addr_decode' of git://git.infradead.org/users/jcooper/linux: arm: mvebu: add address decoding controller to the DT arm: mvebu: add basic address decoding support to Armada 370/XP arm: plat-orion: make bridge_virt_base non-const to support DT use case arm: plat-orion: introduce PLAT_ORION_LEGACY hidden config option arm: plat-orion: use void __iomem pointers for addr-map functions arm: plat-orion: use void __iomem pointers for time functions arm: plat-orion: use void __iomem pointers for MPP functions arm: plat-orion: use void __iomem pointers for UART registration functions arm: mach-mvebu: use IOMEM() for base address definitions arm: mach-orion5x: use IOMEM() for base address definitions arm: mach-mv78xx0: use IOMEM() for base address definitions arm: mach-kirkwood: use IOMEM() for base address definitions arm: mach-dove: use IOMEM() for base address definitions arm: mach-orion5x: use plus instead of or for address definitions arm: mach-mv78xx0: use plus instead of or for address definitions arm: mach-kirkwood: use plus instead of or for address definitions arm: mach-dove: use plus instead of or for address definitions This branch had quite a few conflicts, in particular with the PCI static map rework from Rob Herring, and a few other context conflicts due to changes in Kconfig, etc. I fixed up conflicts in: arch/arm/Kconfig arch/arm/mach-dove/common.c arch/arm/mach-dove/include/mach/dove.h arch/arm/mach-kirkwood/common.c arch/arm/mach-kirkwood/include/mach/kirkwood.h arch/arm/mach-mv78xx0/common.c arch/arm/mach-mv78xx0/include/mach/mv78xx0.h arch/arm/mach-orion5x/common.c arch/arm/mach-orion5x/include/mach/orion5x.h Signed-off-by: Olof Johansson <olof@lixom.net>
		
			
				
	
	
		
			36 lines
		
	
	
	
		
			874 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
			
		
		
	
	
			36 lines
		
	
	
	
		
			874 B
			
		
	
	
	
		
			C
		
	
	
	
	
	
| /*
 | |
|  * arch/arm/mach-orion5x/irq.c
 | |
|  *
 | |
|  * Core IRQ functions for Marvell Orion System On Chip
 | |
|  *
 | |
|  * Maintainer: Tzachi Perelstein <tzachi@marvell.com>
 | |
|  *
 | |
|  * This file is licensed under the terms of the GNU General Public
 | |
|  * License version 2.  This program is licensed "as is" without any
 | |
|  * warranty of any kind, whether express or implied.
 | |
|  */
 | |
| #include <linux/gpio.h>
 | |
| #include <linux/kernel.h>
 | |
| #include <linux/irq.h>
 | |
| #include <linux/io.h>
 | |
| #include <mach/bridge-regs.h>
 | |
| #include <plat/orion-gpio.h>
 | |
| #include <plat/irq.h>
 | |
| 
 | |
| static int __initdata gpio0_irqs[4] = {
 | |
| 	IRQ_ORION5X_GPIO_0_7,
 | |
| 	IRQ_ORION5X_GPIO_8_15,
 | |
| 	IRQ_ORION5X_GPIO_16_23,
 | |
| 	IRQ_ORION5X_GPIO_24_31,
 | |
| };
 | |
| 
 | |
| void __init orion5x_init_irq(void)
 | |
| {
 | |
| 	orion_irq_init(0, MAIN_IRQ_MASK);
 | |
| 
 | |
| 	/*
 | |
| 	 * Initialize gpiolib for GPIOs 0-31.
 | |
| 	 */
 | |
| 	orion_gpio_init(NULL, 0, 32, GPIO_VIRT_BASE, 0,
 | |
| 			IRQ_ORION5X_GPIO_START, gpio0_irqs);
 | |
| }
 |