On Fri, Feb 05, 2021 at 05:39:47AM +0900, Hector Martin wrote: > AIC is the Apple Interrupt Controller found on Apple ARM SoCs, such as > the M1. > > Signed-off-by: Hector Martin <marcan@xxxxxxxxx> > --- > .../interrupt-controller/AAPL,aic.yaml | 88 +++++++++++++++++++ > MAINTAINERS | 2 + > .../interrupt-controller/apple-aic.h | 14 +++ > 3 files changed, 104 insertions(+) > create mode 100644 Documentation/devicetree/bindings/interrupt-controller/AAPL,aic.yaml > create mode 100644 include/dt-bindings/interrupt-controller/apple-aic.h > > diff --git a/Documentation/devicetree/bindings/interrupt-controller/AAPL,aic.yaml b/Documentation/devicetree/bindings/interrupt-controller/AAPL,aic.yaml > new file mode 100644 > index 000000000000..7e119614275a > --- /dev/null > +++ b/Documentation/devicetree/bindings/interrupt-controller/AAPL,aic.yaml > @@ -0,0 +1,88 @@ > +# SPDX-License-Identifier: (GPL-2.0-only OR BSD-2-Clause) > +%YAML 1.2 > +--- > +$id: http://devicetree.org/schemas/interrupt-controller/AAPL,aic.yaml# > +$schema: http://devicetree.org/meta-schemas/core.yaml# > + > +title: Apple Interrupt Controller > + > +maintainers: > + - Hector Martin <marcan@xxxxxxxxx> > + > +description: | > + The Apple Interrupt Controller is a simple interrupt controller present on > + Apple ARM SoC platforms, including various iPhone and iPad devices and the > + "Apple Silicon" M1 Macs. > + > + It provides the following features: > + > + - Level-triggered hardware IRQs wired to SoC blocks > + - Single mask bit per IRQ > + - Per-IRQ affinity setting > + - Automatic masking on event delivery (auto-ack) > + - Software triggering (ORed with hw line) > + - 2 per-CPU IPIs (meant as "self" and "other", but they are interchangeable > + if not symmetric) > + - Automatic prioritization (single event/ack register per CPU, lower IRQs = > + higher priority) > + - Automatic masking on ack > + - Default "this CPU" register view and explicit per-CPU views > + > +allOf: > + - $ref: /schemas/interrupt-controller.yaml# > + > +properties: > + compatible: > + contains: > + enum: > + - AAPL,aic > + - AAPL,m1-aic Instead of 'contains', this should be: items: - const: AAPL,m1-aic - const: AAPL,aic With 'apple' instead... > + > + interrupt-controller: true > + > + '#interrupt-cells': > + const: 3 > + description: | > + The 1st cell contains the interrupt type: > + - 0: Hardware IRQ > + - 1: FIQ > + - 2: IPI > + > + The 2nd cell contains the interrupt number. > + - HW IRQs: interrupt number > + - FIQs: > + - 0: physical timer > + - 1: virtual timer > + - IPIs: > + - 0: normal/"other" IPI (used interanlly for virtual IPIs) > + - 1: self IPI (normally unused) > + > + The 3rd cell contains the interrupt flags. This is normally > + IRQ_TYPE_LEVEL_HIGH (4). > + > + reg: > + description: | > + Specifies base physical address and size of the AIC registers. > + maxItems: 1 > + > +required: > + - compatible > + - '#interrupt-cells' > + - interrupt-controller > + - reg > + > +unevaluatedProperties: false additionalProperties: false (stricter and actually has support implemented) > + > +examples: > + - | > + soc { > + #address-cells = <2>; > + #size-cells = <2>; > + > + aic: interrupt-controller@23b100000 { > + compatible = "AAPL,m1-aic", "AAPL,aic"; > + #interrupt-cells = <3>; > + interrupt-controller; > + reg = <0x2 0x3b100000 0x0 0x8000>; > + }; > + }; > diff --git a/MAINTAINERS b/MAINTAINERS > index 91a7b33834ac..f3d4661731c8 100644 > --- a/MAINTAINERS > +++ b/MAINTAINERS > @@ -1634,6 +1634,8 @@ B: https://github.com/AsahiLinux/linux/issues > C: irc://chat.freenode.net/asahi-dev > T: git https://github.com/AsahiLinux/linux.git > F: Documentation/devicetree/bindings/arm/AAPL.yaml > +F: Documentation/devicetree/bindings/interrupt-controller/AAPL,aic.yaml > +F: include/dt-bindings/interrupt-controller/apple-aic.h > > ARM/ARTPEC MACHINE SUPPORT > M: Jesper Nilsson <jesper.nilsson@xxxxxxxx> > diff --git a/include/dt-bindings/interrupt-controller/apple-aic.h b/include/dt-bindings/interrupt-controller/apple-aic.h > new file mode 100644 > index 000000000000..f54dc0cd6e9a > --- /dev/null > +++ b/include/dt-bindings/interrupt-controller/apple-aic.h > @@ -0,0 +1,14 @@ > +/* SPDX-License-Identifier: GPL-2.0-only OR BSD-2-Clause */ > +#ifndef _DT_BINDINGS_INTERRUPT_CONTROLLER_APPLE_AIC_H > +#define _DT_BINDINGS_INTERRUPT_CONTROLLER_APPLE_AIC_H > + > +#include <dt-bindings/interrupt-controller/irq.h> > + > +#define AIC_IRQ 0 > +#define AIC_FIQ 1 > +#define AIC_IPI 2 > + > +#define AIC_TMR_PHYS 0 > +#define AIC_TMR_VIRT 1 > + > +#endif > -- > 2.30.0 >