MIPS: xilfpga: Use Xilinx Interrupt Controller

IRQs from peripherals such as i2c/uart/ethernet come via
the AXI Interrupt controller.

Select it in Kconfig for xilfpga and add the DT node

Signed-off-by: Zubair Lutfullah Kakakhel <Zubair.Kakakhel@imgtec.com>
Cc: linux-mips@linux-mips.org
Cc: linux-kernel@vger.kernel.org
Patchwork: https://patchwork.linux-mips.org/patch/14592/
Signed-off-by: Ralf Baechle <ralf@linux-mips.org>

diff --git a/arch/mips/Kconfig b/arch/mips/Kconfig
index 7cb4b0e5f49a14cc5ffbb6521fbad3a23b458e87..af4eed3136f5c637fc7c15e19b792fe0b33fe56e 100644 (file)
--- a/arch/mips/Kconfig
+++ b/arch/mips/Kconfig
@@ -479,6 +479,7 @@ config MACH_XILFPGA
        select SYS_SUPPORTS_ZBOOT_UART16550
        select USE_OF
        select USE_GENERIC_EARLY_PRINTK_8250
+       select XILINX_INTC
        help
          This enables support for the IMG University Program MIPSfpga platform.
 

diff --git a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
index 48d21127c3f38b2f575f6f7e96e038c3b2393f16..8db660b06ac9fdfb7989f5ae096ac66a7b0f6fee 100644 (file)
--- a/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
+++ b/arch/mips/boot/dts/xilfpga/nexys4ddr.dts
@@ -17,6 +17,18 @@
                compatible = "mti,cpu-interrupt-controller";
        };
 
+       axi_intc: interrupt-controller@10200000 {
+               #interrupt-cells = <1>;
+               compatible = "xlnx,xps-intc-1.00.a";
+               interrupt-controller;
+               reg = <0x10200000 0x10000>;
+               xlnx,kind-of-intr = <0x0>;
+               xlnx,num-intr-inputs = <0x6>;
+
+               interrupt-parent = <&cpuintc>;
+               interrupts = <6>;
+       };
+
        axi_gpio: gpio@10600000 {
                #gpio-cells = <1>;
                compatible = "xlnx,xps-gpio-1.00.a";