Commit 70404fe3 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'irq-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip 

Pull irq fixes from Thomas Gleixner:
 "A set of irqchip updates:

   - Make the GENERIC_IRQ_MULTI_HANDLER configuration correct

   - Add a missing DT compatible string for the Ingenic driver

   - Remove the pointless debugfs_file pointer from struct irqdomain"

* tag 'irq-urgent-2021-03-14' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip:
  irqchip/ingenic: Add support for the JZ4760
  dt-bindings/irq: Add compatible string for the JZ4760B
  irqchip: Do not blindly select CONFIG_GENERIC_IRQ_MULTI_HANDLER
  ARM: ep93xx: Select GENERIC_IRQ_MULTI_HANDLER directly
  irqdomain: Remove debugfs_file from struct irq_domain
parents 802b31c0 b470ebc9

Documentation/devicetree/bindings/interrupt-controller/ingenic,intc.yaml

+1 −0
Original line number Diff line number Diff line
@@ -23,6 +23,7 @@ properties: 
          - enum:

              - ingenic,jz4775-intc

              - ingenic,jz4770-intc

              - ingenic,jz4760b-intc

          - const: ingenic,jz4760-intc

      - items:

          - const: ingenic,x1000-intc

arch/arm/Kconfig

+1 −0
Original line number Diff line number Diff line
@@ -348,6 +348,7 @@ config ARCH_EP93XX 
	select ARM_AMBA

	imply ARM_PATCH_PHYS_VIRT

	select ARM_VIC

	select GENERIC_IRQ_MULTI_HANDLER

	select AUTO_ZRELADDR

	select CLKDEV_LOOKUP

	select CLKSRC_MMIO

drivers/irqchip/Kconfig

+0 −9
Original line number Diff line number Diff line
@@ -8,7 +8,6 @@ config IRQCHIP 
config ARM_GIC

	bool

	select IRQ_DOMAIN_HIERARCHY

	select GENERIC_IRQ_MULTI_HANDLER

	select GENERIC_IRQ_EFFECTIVE_AFF_MASK



config ARM_GIC_PM
@@ -33,7 +32,6 @@ config GIC_NON_BANKED 


config ARM_GIC_V3

	bool

	select GENERIC_IRQ_MULTI_HANDLER

	select IRQ_DOMAIN_HIERARCHY

	select PARTITION_PERCPU

	select GENERIC_IRQ_EFFECTIVE_AFF_MASK
@@ -64,7 +62,6 @@ config ARM_NVIC 
config ARM_VIC

	bool

	select IRQ_DOMAIN

	select GENERIC_IRQ_MULTI_HANDLER



config ARM_VIC_NR

	int
@@ -99,14 +96,12 @@ config ATMEL_AIC_IRQ 
	bool

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN

	select GENERIC_IRQ_MULTI_HANDLER

	select SPARSE_IRQ



config ATMEL_AIC5_IRQ

	bool

	select GENERIC_IRQ_CHIP

	select IRQ_DOMAIN

	select GENERIC_IRQ_MULTI_HANDLER

	select SPARSE_IRQ



config I8259
@@ -153,7 +148,6 @@ config DW_APB_ICTL 
config FARADAY_FTINTC010

	bool

	select IRQ_DOMAIN

	select GENERIC_IRQ_MULTI_HANDLER

	select SPARSE_IRQ



config HISILICON_IRQ_MBIGEN
@@ -169,7 +163,6 @@ config IMGPDC_IRQ 
config IXP4XX_IRQ

	bool

	select IRQ_DOMAIN

	select GENERIC_IRQ_MULTI_HANDLER

	select SPARSE_IRQ



config MADERA_IRQ
@@ -186,7 +179,6 @@ config CLPS711X_IRQCHIP 
	bool

	depends on ARCH_CLPS711X

	select IRQ_DOMAIN

	select GENERIC_IRQ_MULTI_HANDLER

	select SPARSE_IRQ

	default y
@@ -205,7 +197,6 @@ config OMAP_IRQCHIP 
config ORION_IRQCHIP

	bool

	select IRQ_DOMAIN

	select GENERIC_IRQ_MULTI_HANDLER



config PIC32_EVIC

	bool

drivers/irqchip/irq-ingenic-tcu.c

+1 −0
Original line number Diff line number Diff line
@@ -179,5 +179,6 @@ static int __init ingenic_tcu_irq_init(struct device_node *np, 
}

IRQCHIP_DECLARE(jz4740_tcu_irq, "ingenic,jz4740-tcu", ingenic_tcu_irq_init);

IRQCHIP_DECLARE(jz4725b_tcu_irq, "ingenic,jz4725b-tcu", ingenic_tcu_irq_init);

IRQCHIP_DECLARE(jz4760_tcu_irq, "ingenic,jz4760-tcu", ingenic_tcu_irq_init);

IRQCHIP_DECLARE(jz4770_tcu_irq, "ingenic,jz4770-tcu", ingenic_tcu_irq_init);

IRQCHIP_DECLARE(x1000_tcu_irq, "ingenic,x1000-tcu", ingenic_tcu_irq_init);

drivers/irqchip/irq-ingenic.c

+1 −0
Original line number Diff line number Diff line
@@ -155,6 +155,7 @@ static int __init intc_2chip_of_init(struct device_node *node, 
{

	return ingenic_intc_of_init(node, 2);

}

IRQCHIP_DECLARE(jz4760_intc, "ingenic,jz4760-intc", intc_2chip_of_init);

IRQCHIP_DECLARE(jz4770_intc, "ingenic,jz4770-intc", intc_2chip_of_init);

IRQCHIP_DECLARE(jz4775_intc, "ingenic,jz4775-intc", intc_2chip_of_init);

IRQCHIP_DECLARE(jz4780_intc, "ingenic,jz4780-intc", intc_2chip_of_init);