Commit 15b87bec authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-drivers-2025-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq driver updates from Thomas Gleixner:
 "Boring updates for interrupt drivers:

   - Support for a couple of new ARM64 and RISCV SoC variants and their
     magic interrupt controllers which either can reuse existing code or
     require quirks due to a botched hardware implementation

   - More section mismatch fixes

   - The usual cleanups and fixes all over the place"

* tag 'irq-drivers-2025-11-30' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip: (32 commits)
  irqchip/meson-gpio: Add support for Amlogic S6 S7 and S7D SoCs
  dt-bindings: interrupt-controller: Add support for Amlogic S6 S7 and S7D SoCs
  dt-bindings: interrupt-controller: aspeed,ast2700: Correct #interrupt-cells and interrupts count
  irqchip/aclint-sswi: Add Nuclei UX900 support
  dt-bindings: interrupt-controller: Add Anlogic DR1V90 ACLINT SSWI
  dt-bindings: interrupt-controller: Add Anlogic DR1V90 ACLINT MSWI
  dt-bindings: interrupt-controller: Add Anlogic DR1V90 PLIC
  irqchip/irq-bcm7038-l1: Remove unused reg_mask_status()
  irqchip/sifive-plic: Fix call to __plic_toggle() in M-Mode code path
  irqchip/sifive-plic: Add support for UltraRISC DP1000 PLIC
  irqchip/sifive-plic: Cache the interrupt enable state
  dt-bindings: interrupt-controller: Add UltraRISC DP1000 PLIC
  dt-bindings: vendor-prefixes: Add UltraRISC
  irqchip/qcom-irq-combiner: Rename driver structure
  irqchip/riscv-imsic: Inline imsic_vector_from_local_id()
  irqchip/riscv-imsic: Embed the vector array in lpriv
  irqchip/riscv-imsic: Remove redundant irq_data lookups
  irqchip/ts4800: Drop unused module alias
  irqchip/mvebu-pic: Drop unused module alias
  irqchip/meson-gpio: Drop unused module alias
  ...
parents 6863c838 fc584d87

Documentation/devicetree/bindings/interrupt-controller/amlogic,meson-gpio-intc.yaml

+3 −0
Original line number Diff line number Diff line
@@ -39,6 +39,9 @@ properties: 
              - amlogic,a4-gpio-ao-intc

              - amlogic,a5-gpio-intc

              - amlogic,c3-gpio-intc

              - amlogic,s6-gpio-intc

              - amlogic,s7-gpio-intc

              - amlogic,s7d-gpio-intc

              - amlogic,t7-gpio-intc

          - const: amlogic,meson-gpio-intc

Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2700-intc.yaml

+9 −4
Original line number Diff line number Diff line
@@ -25,13 +25,14 @@ properties: 
  interrupt-controller: true



  '#interrupt-cells':

    const: 2

    const: 1

    description:

      The first cell is the IRQ number, the second cell is the trigger

      type as defined in interrupt.txt in this directory.



  interrupts:

    maxItems: 6

    minItems: 1

    maxItems: 10

    description: |

      Depend to which INTC0 or INTC1 used.

      INTC0 and INTC1 are two kinds of interrupt controller with enable and raw
@@ -74,13 +75,17 @@ examples: 
        interrupt-controller@12101b00 {

            compatible = "aspeed,ast2700-intc-ic";

            reg = <0 0x12101b00 0 0x10>;

            #interrupt-cells = <2>;

            #interrupt-cells = <1>;

            interrupt-controller;

            interrupts = <GIC_SPI 192 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 193 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 194 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 195 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 196 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>;

                         <GIC_SPI 197 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 198 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 199 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 200 IRQ_TYPE_LEVEL_HIGH>,

                         <GIC_SPI 201 IRQ_TYPE_LEVEL_HIGH>;

        };

    };

Documentation/devicetree/bindings/interrupt-controller/sifive,plic-1.0.0.yaml

+4 −0
Original line number Diff line number Diff line
@@ -58,6 +58,7 @@ properties: 
          - const: andestech,nceplic100

      - items:

          - enum:

              - anlogic,dr1v90-plic

              - canaan,k210-plic

              - eswin,eic7700-plic

              - sifive,fu540-c000-plic
@@ -75,6 +76,9 @@ properties: 
              - sophgo,sg2044-plic

              - thead,th1520-plic

          - const: thead,c900-plic

      - items:

          - const: ultrarisc,dp1000-plic

          - const: ultrarisc,cp100-plic

      - items:

          - const: sifive,plic-1.0.0

          - const: riscv,plic0

Documentation/devicetree/bindings/interrupt-controller/thead,c900-aclint-mswi.yaml

+11 −6
Original line number Diff line number Diff line
@@ -4,18 +4,23 @@ 
$id: http://devicetree.org/schemas/interrupt-controller/thead,c900-aclint-mswi.yaml#

$schema: http://devicetree.org/meta-schemas/core.yaml#



title: Sophgo sg2042 CLINT Machine-level Software Interrupt Device

title: ACLINT Machine-level Software Interrupt Device



maintainers:

  - Inochi Amaoto <inochiama@outlook.com>



properties:

  compatible:

    items:

    oneOf:

      - items:

          - enum:

              - sophgo,sg2042-aclint-mswi

              - sophgo,sg2044-aclint-mswi

          - const: thead,c900-aclint-mswi

      - items:

          - enum:

              - anlogic,dr1v90-aclint-mswi

          - const: nuclei,ux900-aclint-mswi



  reg:

    maxItems: 1

Documentation/devicetree/bindings/interrupt-controller/thead,c900-aclint-sswi.yaml

+4 −0
Original line number Diff line number Diff line
@@ -30,6 +30,10 @@ properties: 
          - const: thead,c900-aclint-sswi

      - items:

          - const: mips,p8700-aclint-sswi

      - items:

          - enum:

              - anlogic,dr1v90-aclint-sswi

          - const: nuclei,ux900-aclint-sswi



  reg:

    maxItems: 1