Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

irqchip: Move ARM VIC to drivers/irqchip

Now that we have drivers/irqchip, move VIC irqchip to drivers/irqchip.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>

+21 -16
-15
arch/arm/common/Kconfig
··· 1 - config ARM_VIC 2 - bool 3 - select IRQ_DOMAIN 4 - select MULTI_IRQ_HANDLER 5 - 6 - config ARM_VIC_NR 7 - int 8 - default 4 if ARCH_S5PV210 9 - default 3 if ARCH_S5PC100 10 - default 2 11 - depends on ARM_VIC 12 - help 13 - The maximum number of VICs available in the system, for 14 - power management. 15 - 16 1 config ICST 17 2 bool 18 3
-1
arch/arm/common/Makefile
··· 2 2 # Makefile for the linux kernel. 3 3 # 4 4 5 - obj-$(CONFIG_ARM_VIC) += vic.o 6 5 obj-$(CONFIG_ICST) += icst.o 7 6 obj-$(CONFIG_SA1111) += sa1111.o 8 7 obj-$(CONFIG_PCI_HOST_VIA82C505) += via82c505.o
+5
arch/arm/common/vic.c drivers/irqchip/irq-vic.c
··· 35 35 #include <asm/mach/irq.h> 36 36 #include <asm/hardware/vic.h> 37 37 38 + #include "irqchip.h" 39 + 38 40 #define VIC_IRQ_STATUS 0x00 39 41 #define VIC_FIQ_STATUS 0x04 40 42 #define VIC_INT_SELECT 0x0c /* 1 = FIQ, 0 = IRQ */ ··· 483 481 484 482 return 0; 485 483 } 484 + IRQCHIP_DECLARE(arm_pl190_vic, "arm,pl190-vic", vic_of_init); 485 + IRQCHIP_DECLARE(arm_pl192_vic, "arm,pl192-vic", vic_of_init); 486 + IRQCHIP_DECLARE(arm_versatile_vic, "arm,versatile-vic", vic_of_init); 486 487 #endif /* CONFIG OF */
+15
drivers/irqchip/Kconfig
··· 10 10 config GIC_NON_BANKED 11 11 bool 12 12 13 + config ARM_VIC 14 + bool 15 + select IRQ_DOMAIN 16 + select MULTI_IRQ_HANDLER 17 + 18 + config ARM_VIC_NR 19 + int 20 + default 4 if ARCH_S5PV210 21 + default 3 if ARCH_S5PC100 22 + default 2 23 + depends on ARM_VIC 24 + help 25 + The maximum number of VICs available in the system, for 26 + power management. 27 + 13 28 config VERSATILE_FPGA_IRQ 14 29 bool 15 30 select IRQ_DOMAIN
+1
drivers/irqchip/Makefile
··· 4 4 obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi.o 5 5 obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o 6 6 obj-$(CONFIG_ARM_GIC) += irq-gic.o 7 + obj-$(CONFIG_ARM_VIC) += irq-vic.o 7 8 obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o