From: Linus Torvalds <torvalds@linux-foundation.org>
Date: Sun, 21 Feb 2021 19:53:06 +0000 (-0800)
Subject: Merge tag 'irq-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git... 
X-Git-Url: http://git.maquefel.me/?a=commitdiff_plain;h=b5183bc94b6d2789abb9b5eda6cc3e0601524c79;p=linux.git

Merge tag 'irq-core-2021-02-15' of git://git./linux/kernel/git/tip/tip

Pull irq updates from Thomas Gleixner:
 "Updates for the irq subsystem:

   - The usual new irq chip driver (Realtek RTL83xx)

   - Removal of sirfsoc and tango irq chip drivers

   - Conversion of the sun6i chip support to hierarchical irq domains

   - The usual fixes, improvements and cleanups all over the place"

* tag 'irq-core-2021-02-15' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/imx: IMX_INTMUX should not default to y, unconditionally
  irqchip/loongson-pch-msi: Use bitmap_zalloc() to allocate bitmap
  irqchip/csky-mpintc: Prevent selection on unsupported platforms
  irqchip: Add support for Realtek RTL838x/RTL839x interrupt controller
  dt-bindings: interrupt-controller: Add Realtek RTL838x/RTL839x support
  irqchip/ls-extirq: add IRQCHIP_SKIP_SET_WAKE to the irqchip flags
  genirq: Use new tasklet API for resend_tasklet
  dt-bindings: qcom,pdc: Add compatible for SM8350
  dt-bindings: qcom,pdc: Add compatible for SM8250
  irqchip/sun6i-r: Add wakeup support
  irqchip/sun6i-r: Use a stacked irqchip driver
  dt-bindings: irq: sun6i-r: Add a compatible for the H3
  dt-bindings: irq: sun6i-r: Split the binding from sun7i-nmi
  irqchip/gic-v3: Fix typos in PMR/RPR SCR_EL3.FIQ handling explanation
  irqchip: Remove sirfsoc driver
  irqchip: Remove sigma tango driver
---

b5183bc94b6d2789abb9b5eda6cc3e0601524c79
diff --cc Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
index 4fd1e2780026e,f34ecc8c7093c..7fc9ad5ef38cc
--- a/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
+++ b/Documentation/devicetree/bindings/interrupt-controller/allwinner,sun7i-a20-sc-nmi.yaml
@@@ -25,17 -25,7 +25,10 @@@ properties
        - const: allwinner,sun6i-a31-sc-nmi
          deprecated: true
        - const: allwinner,sun7i-a20-sc-nmi
-       - items:
-           - const: allwinner,sun8i-a83t-r-intc
-           - const: allwinner,sun6i-a31-r-intc
 +      - items:
 +          - const: allwinner,sun8i-v3s-nmi
 +          - const: allwinner,sun9i-a80-nmi
        - const: allwinner,sun9i-a80-nmi
-       - items:
-           - const: allwinner,sun50i-a64-r-intc
-           - const: allwinner,sun6i-a31-r-intc
        - items:
            - const: allwinner,sun50i-a100-nmi
            - const: allwinner,sun9i-a80-nmi