aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorZubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>2016-11-14 07:13:45 -0500
committerMarc Zyngier <marc.zyngier@arm.com>2016-11-29 04:14:49 -0500
commit0547dc7885856c93b0c8bbf1f590ceccf0c87835 (patch)
tree2ba9b4d9401c1b75c880fd6515a40108916bc18e
parentbb29cecb3bcde74438a8a694a5b2ba4852c8eac1 (diff)
microblaze/irqchip: Move intc driver to irqchip
The Xilinx AXI Interrupt Controller IP block is used by the MIPS based xilfpga platform and a few PowerPC based platforms. Move the interrupt controller code out of arch/microblaze so that it can be used by everyone Tested-by: Michal Simek <michal.simek@xilinx.com> Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com> Signed-off-by: Marc Zyngier <marc.zyngier@arm.com>
-rw-r--r--arch/microblaze/Kconfig1
-rw-r--r--arch/microblaze/kernel/Makefile2
-rw-r--r--drivers/irqchip/Kconfig4
-rw-r--r--drivers/irqchip/Makefile1
-rw-r--r--drivers/irqchip/irq-xilinx-intc.c (renamed from arch/microblaze/kernel/intc.c)0
5 files changed, 7 insertions, 1 deletions
diff --git a/arch/microblaze/Kconfig b/arch/microblaze/Kconfig
index 86f65721e629..85885a501dce 100644
--- a/arch/microblaze/Kconfig
+++ b/arch/microblaze/Kconfig
@@ -27,6 +27,7 @@ config MICROBLAZE
27 select HAVE_MEMBLOCK_NODE_MAP 27 select HAVE_MEMBLOCK_NODE_MAP
28 select HAVE_OPROFILE 28 select HAVE_OPROFILE
29 select IRQ_DOMAIN 29 select IRQ_DOMAIN
30 select XILINX_INTC
30 select MODULES_USE_ELF_RELA 31 select MODULES_USE_ELF_RELA
31 select OF 32 select OF
32 select OF_EARLY_FLATTREE 33 select OF_EARLY_FLATTREE
diff --git a/arch/microblaze/kernel/Makefile b/arch/microblaze/kernel/Makefile
index f08bacaf8a95..e098381af928 100644
--- a/arch/microblaze/kernel/Makefile
+++ b/arch/microblaze/kernel/Makefile
@@ -15,7 +15,7 @@ endif
15extra-y := head.o vmlinux.lds 15extra-y := head.o vmlinux.lds
16 16
17obj-y += dma.o exceptions.o \ 17obj-y += dma.o exceptions.o \
18 hw_exception_handler.o intc.o irq.o \ 18 hw_exception_handler.o irq.o \
19 platform.o process.o prom.o ptrace.o \ 19 platform.o process.o prom.o ptrace.o \
20 reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o 20 reset.o setup.o signal.o sys_microblaze.o timer.o traps.o unwind.o
21 21
diff --git a/drivers/irqchip/Kconfig b/drivers/irqchip/Kconfig
index bc0af3307bbf..ae96731cd2fb 100644
--- a/drivers/irqchip/Kconfig
+++ b/drivers/irqchip/Kconfig
@@ -211,6 +211,10 @@ config XTENSA_MX
211 bool 211 bool
212 select IRQ_DOMAIN 212 select IRQ_DOMAIN
213 213
214config XILINX_INTC
215 bool
216 select IRQ_DOMAIN
217
214config IRQ_CROSSBAR 218config IRQ_CROSSBAR
215 bool 219 bool
216 help 220 help
diff --git a/drivers/irqchip/Makefile b/drivers/irqchip/Makefile
index e4dbfc85abdb..0e55d94065bf 100644
--- a/drivers/irqchip/Makefile
+++ b/drivers/irqchip/Makefile
@@ -52,6 +52,7 @@ obj-$(CONFIG_TB10X_IRQC) += irq-tb10x.o
52obj-$(CONFIG_TS4800_IRQ) += irq-ts4800.o 52obj-$(CONFIG_TS4800_IRQ) += irq-ts4800.o
53obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o 53obj-$(CONFIG_XTENSA) += irq-xtensa-pic.o
54obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o 54obj-$(CONFIG_XTENSA_MX) += irq-xtensa-mx.o
55obj-$(CONFIG_XILINX_INTC) += irq-xilinx-intc.o
55obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o 56obj-$(CONFIG_IRQ_CROSSBAR) += irq-crossbar.o
56obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o 57obj-$(CONFIG_SOC_VF610) += irq-vf610-mscm-ir.o
57obj-$(CONFIG_BCM6345_L1_IRQ) += irq-bcm6345-l1.o 58obj-$(CONFIG_BCM6345_L1_IRQ) += irq-bcm6345-l1.o
diff --git a/arch/microblaze/kernel/intc.c b/drivers/irqchip/irq-xilinx-intc.c
index 90bec7d71f85..90bec7d71f85 100644
--- a/arch/microblaze/kernel/intc.c
+++ b/drivers/irqchip/irq-xilinx-intc.c