From 9c67774e9fcfb4f1af78790ae4d4e11b2b0bb6a5 Mon Sep 17 00:00:00 2001 From: Rob Herring Date: Tue, 20 Nov 2012 21:21:40 -0600 Subject: [PATCH] --- yaml --- r: 355199 b: refs/heads/master c: 81243e444c6e9d1625073e4a3d3bc244c8a545f0 h: refs/heads/master i: 355197: b51d0393af7a09e265887a0a192d6d5d32dcc652 355195: 882d41633556b10cd00070582085f918fe9ed39d 355191: bc82268808c3c7aac0a29ed1263d8ea99a41066e 355183: 2158a2be81514ecf1a5adf0983a65b9a5badc75d 355167: 87fab31b7dfdce74b58f84101f1dd551d9236280 355135: 3de35174b8500292789e111558537d96dcee4a77 355071: e26e593b2bf37e74c9fa8070a8e3d9980869c31d v: v3 --- [refs] | 2 +- trunk/arch/arm/common/Kconfig | 8 -------- trunk/arch/arm/common/Makefile | 1 - trunk/drivers/irqchip/Kconfig | 8 ++++++++ trunk/drivers/irqchip/Makefile | 3 ++- .../{arch/arm/common/gic.c => drivers/irqchip/irq-gic.c} | 7 +++++++ 6 files changed, 18 insertions(+), 11 deletions(-) rename trunk/{arch/arm/common/gic.c => drivers/irqchip/irq-gic.c} (98%) diff --git a/[refs] b/[refs] index 7a8f45a8d909..1814fdfca53b 100644 --- a/[refs] +++ b/[refs] @@ -1,2 +1,2 @@ --- -refs/heads/master: 1d5cc604f42ff1acdec0407247b2f720135ba0c2 +refs/heads/master: 81243e444c6e9d1625073e4a3d3bc244c8a545f0 diff --git a/trunk/arch/arm/common/Kconfig b/trunk/arch/arm/common/Kconfig index 45ceeb0e93e0..7bf52b2b7d33 100644 --- a/trunk/arch/arm/common/Kconfig +++ b/trunk/arch/arm/common/Kconfig @@ -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 diff --git a/trunk/arch/arm/common/Makefile b/trunk/arch/arm/common/Makefile index e8a4e58f1b82..4104b821f860 100644 --- a/trunk/arch/arm/common/Makefile +++ b/trunk/arch/arm/common/Makefile @@ -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 diff --git a/trunk/drivers/irqchip/Kconfig b/trunk/drivers/irqchip/Kconfig index 93dfd8fa66c7..98f30b0d531c 100644 --- a/trunk/drivers/irqchip/Kconfig +++ b/trunk/drivers/irqchip/Kconfig @@ -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 diff --git a/trunk/drivers/irqchip/Makefile b/trunk/drivers/irqchip/Makefile index 29b78c9449c8..f2a9a07a3f12 100644 --- a/trunk/drivers/irqchip/Makefile +++ b/trunk/drivers/irqchip/Makefile @@ -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 diff --git a/trunk/arch/arm/common/gic.c b/trunk/drivers/irqchip/irq-gic.c similarity index 98% rename from trunk/arch/arm/common/gic.c rename to trunk/drivers/irqchip/irq-gic.c index 90eebfeae039..dc511a4a0757 100644 --- a/trunk/arch/arm/common/gic.c +++ b/trunk/drivers/irqchip/irq-gic.c @@ -45,6 +45,8 @@ #include #include +#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