redonkable
/
alistair23-linux
1
0
Fork 0
Code Releases Activity

irqchip: Move ARM GIC to drivers/irqchip 

Now that we have drivers/irqchip, move GIC irqchip to drivers/irqchip. This
is necessary to share the GIC with arm and arm64.

Signed-off-by: Rob Herring <rob.herring@calxeda.com>
Cc: Russell King <linux@arm.linux.org.uk>
Cc: Thomas Gleixner <tglx@linutronix.de>
hifive-unleashed-5.1
Rob Herring 2012-11-20 21:21:40 -06:00
parent 1d5cc604f4
commit 81243e444c
5 changed files with 17 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
arch/arm/common/Kconfig
View File

@ -1,11 +1,3 @@
config ARM_GIC
bool
select IRQ_DOMAIN
select MULTI_IRQ_HANDLER
config GIC_NON_BANKED
bool
config ARM_VIC
bool
select IRQ_DOMAIN

1
arch/arm/common/Makefile
View File

@ -2,7 +2,6 @@
# Makefile for the linux kernel.
#
obj-$(CONFIG_ARM_GIC) += gic.o
obj-$(CONFIG_ARM_VIC) += vic.o
obj-$(CONFIG_ICST) += icst.o
obj-$(CONFIG_SA1111) += sa1111.o

8
drivers/irqchip/Kconfig
View File

@ -2,6 +2,14 @@ config IRQCHIP
def_bool y
depends on OF_IRQ
config ARM_GIC
bool
select IRQ_DOMAIN
select MULTI_IRQ_HANDLER
config GIC_NON_BANKED
bool
config VERSATILE_FPGA_IRQ
bool
select IRQ_DOMAIN

3
drivers/irqchip/Makefile
View File

@ -2,5 +2,6 @@ obj-$(CONFIG_IRQCHIP) += irqchip.o
obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
obj-$(CONFIG_ARCH_SUNXI) += irq-sunxi.o
obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o
obj-$(CONFIG_ARCH_SPEAR3XX) += spear-shirq.o
obj-$(CONFIG_ARM_GIC) += irq-gic.o
obj-$(CONFIG_VERSATILE_FPGA_IRQ) += irq-versatile-fpga.o

7
arch/arm/common/gic.c → drivers/irqchip/irq-gic.c
View File

@ -45,6 +45,8 @@
#include <asm/mach/irq.h>
#include <asm/hardware/gic.h>
#include "irqchip.h"
union gic_base {
void __iomem *common_base;
void __percpu __iomem **percpu_base;
@ -814,4 +816,9 @@ int __init gic_of_init(struct device_node *node, struct device_node *parent)
gic_cnt++;
return 0;
}
IRQCHIP_DECLARE(cortex_a15_gic, "arm,cortex-a15-gic", gic_of_init);
IRQCHIP_DECLARE(cortex_a9_gic, "arm,cortex-a9-gic", gic_of_init);
IRQCHIP_DECLARE(msm_8660_qgic, "qcom,msm-8660-qgic", gic_of_init);
IRQCHIP_DECLARE(msm_qgic2, "qcom,msm-qgic2", gic_of_init);
#endif