From: robherring2@gmail.com (Rob Herring)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH 1/3] irqchip: Move ARM GIC to drivers/irqchip
Date: Tue, 30 Oct 2012 09:54:18 -0500 [thread overview]
Message-ID: <1351608860-24617-2-git-send-email-robherring2@gmail.com> (raw)
In-Reply-To: <1351608860-24617-1-git-send-email-robherring2@gmail.com>
From: Rob Herring <rob.herring@calxeda.com>
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>
---
arch/arm/common/Kconfig | 8 --------
arch/arm/common/Makefile | 1 -
drivers/irqchip/Kconfig | 8 ++++++++
drivers/irqchip/Makefile | 1 +
arch/arm/common/gic.c => drivers/irqchip/irq-gic.c | 0
drivers/irqchip/irqchip.c | 10 ++++++++++
drivers/irqchip/irqchip.h | 1 +
7 files changed, 20 insertions(+), 9 deletions(-)
rename arch/arm/common/gic.c => drivers/irqchip/irq-gic.c (100%)
diff --git a/arch/arm/common/Kconfig b/arch/arm/common/Kconfig
index 45ceeb0..7bf52b2 100644
--- a/arch/arm/common/Kconfig
+++ b/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/arch/arm/common/Makefile b/arch/arm/common/Makefile
index e8a4e58..4104b82 100644
--- a/arch/arm/common/Makefile
+++ b/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/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index 88b0929..2d7f350 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -1,3 +1,11 @@
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
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index 5148ffd..94118db 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -1,3 +1,4 @@
obj-$(CONFIG_IRQCHIP) += irqchip.o
obj-$(CONFIG_ARCH_BCM2835) += irq-bcm2835.o
obj-$(CONFIG_ARCH_MVEBU) += irq-armada-370-xp.o
+obj-$(CONFIG_ARM_GIC) += irq-gic.o
diff --git a/arch/arm/common/gic.c b/drivers/irqchip/irq-gic.c
similarity index 100%
rename from arch/arm/common/gic.c
rename to drivers/irqchip/irq-gic.c
diff --git a/drivers/irqchip/irqchip.c b/drivers/irqchip/irqchip.c
index f36d423..3f37397 100644
--- a/drivers/irqchip/irqchip.c
+++ b/drivers/irqchip/irqchip.c
@@ -14,6 +14,16 @@
#include "irqchip.h"
static const struct of_device_id irqchip_of_match[] __initconst = {
+#ifdef CONFIG_ARM_GIC
+ {
+ .compatible = "arm,cortex-a15-gic",
+ .data = gic_of_init,
+ },
+ {
+ .compatible = "arm,cortex-a9-gic",
+ .data = gic_of_init,
+ },
+#endif
#ifdef CONFIG_ARCH_BCM2835
{
.compatible = "brcm,bcm2835-armctrl-ic",
diff --git a/drivers/irqchip/irqchip.h b/drivers/irqchip/irqchip.h
index 0a0d7af..62773ab3 100644
--- a/drivers/irqchip/irqchip.h
+++ b/drivers/irqchip/irqchip.h
@@ -14,5 +14,6 @@
int bcm2835_irqchip_init(struct device_node *node, struct device_node *parent);
int armada_370_xp_mpic_of_init(struct device_node *node,
struct device_node *parent);
+int gic_of_init(struct device_node *node, struct device_node *parent);
#endif
--
1.7.10.4
next prev parent reply other threads:[~2012-10-30 14:54 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2012-10-30 14:54 [PATCH 0/7] Move GIC and VIC to drivers/irqchip Rob Herring
2012-10-30 14:54 ` Rob Herring [this message]
2012-10-30 15:01 ` [PATCH 1/3] irqchip: Move ARM GIC " Thomas Petazzoni
2012-10-30 16:05 ` Rob Herring
2012-10-30 17:21 ` Rob Herring
2012-10-30 22:30 ` Thomas Petazzoni
2012-10-30 22:47 ` Russell King - ARM Linux
2012-10-31 0:04 ` Rob Herring
2012-10-31 9:05 ` Russell King - ARM Linux
2012-10-31 11:56 ` Catalin Marinas
2012-10-31 14:29 ` Rob Herring
2012-10-31 15:07 ` Russell King - ARM Linux
2012-10-30 14:54 ` [PATCH 2/3] irqchip: Move ARM VIC " Rob Herring
2012-10-30 18:27 ` Stephen Warren
2012-10-30 14:54 ` [PATCH 3/3] ARM: highbank: use common irqchip_init Rob Herring
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1351608860-24617-2-git-send-email-robherring2@gmail.com \
--to=robherring2@gmail.com \
--cc=linux-arm-kernel@lists.infradead.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.