dt-bindings: interrupt-controller: Add binding for the Microsemi Ocelot interrupt controller
Subsystems (2)
PATCH 1/2 dt-bindings: interrupt-controller: Add binding for the Microsemi Ocelot interrupt controller
Add the Device Tree binding documentation for the Microsemi Ocelot interrupt controller that is part of the ICPU. It is connected directly to the MIPS core interrupt controller.
--- .../interrupt-controller/mscc,ocelot-icpu-intr.txt | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) create mode 100644 Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt
Documentation/devicetree/bindings/interrupt-controller/mscc,ocelot-icpu-intr.txt new file +22 -0
@@ -0,0 +1,22 @@ +Microsemi Ocelot SoC ICPU Interrupt Controller + +Required properties: + +- compatible : should be "mscc,ocelot-icpu-intr" +- reg : Specifies base physical address and size of the registers. +- interrupt-controller : Identifies the node as an interrupt controller +- #interrupt-cells : Specifies the number of cells needed to encode an + interrupt source. The value shall be 1. +- interrupt-parent : phandle of the CPU interrupt controller. +- interrupts : Specifies the CPU interrupt the controller is connected to. + +Example: + + intc: interrupt-controller@70000070 { + compatible = "mscc,ocelot-icpu-intr"; + reg = <0x70000070 0x70>; + #interrupt-cells = <1>; + interrupt-controller; + interrupt-parent = <&cpuintc>; + interrupts = <2>; + };
Signature · 1 line
2.16.2
PATCH 2/2 irqchip: Add a driver for the Microsemi Ocelot controller
The Microsemi Ocelot SoC has a pretty simple IRQ controller in its ICPU block. Add a driver for it.
--- drivers/irqchip/Kconfig | 5 ++ drivers/irqchip/Makefile | 1 + drivers/irqchip/irq-mscc-ocelot.c | 109 ++++++++++++++++++++++++++++++++++++++ 3 files changed, 115 insertions(+) create mode 100644 drivers/irqchip/irq-mscc-ocelot.c
drivers/irqchip/Kconfig +5 -0
@@ -286,6 +286,11 @@ config IRQ_MXS select IRQ_DOMAIN select STMP_DEVICE +config MSCC_OCELOT_IRQ + bool + select IRQ_DOMAIN + select GENERIC_IRQ_CHIP + config MVEBU_GICP bool
drivers/irqchip/Makefile +1 -0
@@ -72,6 +72,7 @@ obj-$(CONFIG_ARCH_SA1100) += irq-sa11x0.o obj-$(CONFIG_INGENIC_IRQ) += irq-ingenic.o obj-$(CONFIG_IMX_GPCV2) += irq-imx-gpcv2.o obj-$(CONFIG_PIC32_EVIC) += irq-pic32-evic.o +obj-$(CONFIG_MSCC_OCELOT_IRQ) += irq-mscc-ocelot.o obj-$(CONFIG_MVEBU_GICP) += irq-mvebu-gicp.o obj-$(CONFIG_MVEBU_ICU) += irq-mvebu-icu.o obj-$(CONFIG_MVEBU_ODMI) += irq-mvebu-odmi.o
drivers/irqchip/irq-mscc-ocelot.c new file +109 -0
109 lines not on this page · raw message
Signature · 1 line
2.16.2
Re: [PATCH 2/2] irqchip: Add a driver for the Microsemi Ocelot controller
drivers/irqchip/irq-mscc-ocelot.c line 5
Quoted 8 lines · Alexandre Belloni
drivers/irqchip/irq-mscc-ocelot.c new file +5
-0@@ -0,0 +1,109 @@ +// SPDX-License-Identifier: (GPL-2.0 OR MIT) +/* +* Microsemi Ocelot IRQ controller driver +* +* License: Dual MIT/GPL
The whole point of SPDX identifiers is to get rid of this kind of sloppy and inexact license references. The SPDX identifier above is clear and
precise: The code is dual licensed under GPL V2 only or MIT.
Now looking again at your extra line:
drivers/irqchip/irq-mscc-ocelot.c line 5
Quoted 1 line
drivers/irqchip/irq-mscc-ocelot.c new file +1
-0+* License: Dual MIT/GPL
It does not tell which version of GPL.
Please get rid of that.
Quoted 20 lines
drivers/irqchip/irq-mscc-ocelot.c new file +20
-0+* Copyright (c) 2017 Microsemi Corporation +*/ +#include <linux/bitops.h> +#include <linux/irq.h> +#include <linux/of_address.h> +#include <linux/of_irq.h> +#include <linux/irqchip.h> +#include <linux/irqchip/chained_irq.h> +#include <linux/interrupt.h> + +#define ICPU_CFG_INTR_INTR_STICKY 0x10 +#define ICPU_CFG_INTR_INTR_ENA 0x18 +#define ICPU_CFG_INTR_INTR_ENA_CLR 0x1c +#define ICPU_CFG_INTR_INTR_ENA_SET 0x20 +#define ICPU_CFG_INTR_DST_INTR_IDENT (x) (0x38 + 0x4 * (x)) +#define ICPU_CFG_INTR_INTR_TRIGGER (x) (0x5c + 0x4 * (x)) + +#define OCELOT_NR_IRQ 24 + +static void ocelot_irq_unmask (struct irq_data *data)
drivers/irqchip/irq-mscc-ocelot.c line 35
Quoted 10 lines
drivers/irqchip/irq-mscc-ocelot.c new file +10
-0+{ +struct irq_chip_generic *gc =irq_data_get_irq_chip_data (data); +struct irq_chip_type *ct =irq_data_get_chip_type (data); +unsigned int mask = data->mask; +u32 val; + +irq_gc_lock (gc); + val =irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (0 )) | +irq_reg_readl (gc,ICPU_CFG_INTR_INTR_TRIGGER (1 )); +if ((val & mask) ==0 )
Usual kernel style is:
if (!(val & mask))
drivers/irqchip/irq-mscc-ocelot.c line 98
Quoted 10 lines
drivers/irqchip/irq-mscc-ocelot.c new file +9
-0+irq_reg_writel (gc, mask,ICPU_CFG_INTR_INTR_STICKY ); + + *ct->mask_cache &= ~mask; +irq_reg_writel (gc, mask,ICPU_CFG_INTR_INTR_ENA_SET ); +irq_gc_unlock (gc); +} + +irq_reg_writel (gc,0 ,ICPU_CFG_INTR_INTR_ENA );/* Mask all */ +irq_reg_writel (gc,0xffffffff ,ICPU_CFG_INTR_INTR_STICKY );/* Ack pending */
Please do not use tail comments. They are annoying as they disturb the visual parsing.
/* Mask and ack all interrupts */ irq_reg_writel(gc, 0, ICPU_CFG_INTR_INTR_ENA); irq_reg_writel(gc, 0xffffffff, ICPU_CFG_INTR_INTR_STICKY);
is way better to read.
Other than those nitpicks. Nice work!
Thanks,
tglx