Commit 2bd1753e authored by Marc Zyngier's avatar Marc Zyngier
Browse files

Merge branch irq/misc-5.20 into irq/irqchip-next 



* irq/misc-5.20:
  : .
  : Misc IRQ changes for 5.20:
  :
  : - Let irq_set_chip_handler_name_locked() take a const struct irq_chip *
  :
  : - Convert the ocelot irq_chip to being immutable (depends on the above)
  :
  : - Tidy-up the NOMAP irqdomain API variant
  :
  : - Teach action_show() to use for_each_action_of_desc()
  :
  : - Check ioremap() return value in the MIPS GIC driver
  :
  : - Move MMP driver init function declarations into the common .h
  :
  : - The obligatory typo fixes
  : .
  irqchip/mmp: Declare init functions in common header file
  irqchip/mips-gic: Check the return value of ioremap() in gic_of_init()
  genirq: Use for_each_action_of_desc in actions_show()
  irqdomain: Use hwirq_max instead of revmap_size for NOMAP domains
  irqdomain: Report irq number for NOMAP domains
  irqchip/gic-v3: Fix comment typo
  pinctrl: ocelot: Make irq_chip immutable
  genirq: Allow irq_set_chip_handler_name_locked() to take a const irq_chip

Signed-off-by: default avatarMarc Zyngier <maz@kernel.org>
parents 0fa72ed0 9d9b010f

arch/arm/mach-mmp/mmp2.h

+1 −1
Original line number Diff line number Diff line
@@ -5,13 +5,13 @@ 
#include <linux/platform_data/pxa_sdhci.h>



extern void mmp2_timer_init(void);

extern void __init mmp2_init_icu(void);

extern void __init mmp2_init_irq(void);

extern void mmp2_clear_pmic_int(void);



#include <linux/i2c.h>

#include <linux/platform_data/i2c-pxa.h>

#include <linux/platform_data/dma-mmp_tdma.h>

#include <linux/irqchip/mmp.h>



#include "devices.h"

arch/arm/mach-mmp/pxa168.h

+1 −1
Original line number Diff line number Diff line
@@ -5,7 +5,6 @@ 
#include <linux/reboot.h>



extern void pxa168_timer_init(void);

extern void __init icu_init_irq(void);

extern void __init pxa168_init_irq(void);

extern void pxa168_restart(enum reboot_mode, const char *);

extern void pxa168_clear_keypad_wakeup(void);
@@ -18,6 +17,7 @@ extern void pxa168_clear_keypad_wakeup(void); 
#include <linux/pxa168_eth.h>

#include <linux/platform_data/mv_usb.h>

#include <linux/soc/mmp/cputype.h>

#include <linux/irqchip/mmp.h>



#include "devices.h"

arch/arm/mach-mmp/pxa910.h

+1 −1
Original line number Diff line number Diff line
@@ -3,13 +3,13 @@ 
#define __ASM_MACH_PXA910_H



extern void pxa910_timer_init(void);

extern void __init icu_init_irq(void);

extern void __init pxa910_init_irq(void);



#include <linux/i2c.h>

#include <linux/platform_data/i2c-pxa.h>

#include <linux/platform_data/mtd-nand-pxa3xx.h>

#include <video/mmp_disp.h>

#include <linux/irqchip/mmp.h>



#include "devices.h"

drivers/irqchip/irq-gic-v3.c

+1 −1
Original line number Diff line number Diff line
@@ -1783,7 +1783,7 @@ static void gic_enable_nmi_support(void) 
	 * the security state of the GIC (controlled by the GICD_CTRL.DS bit)

	 * and if Group 0 interrupts can be delivered to Linux in the non-secure

	 * world as FIQs (controlled by the SCR_EL3.FIQ bit). These affect the

	 * the ICC_PMR_EL1 register and the priority that software assigns to

	 * ICC_PMR_EL1 register and the priority that software assigns to

	 * interrupts:

	 *

	 * GICD_CTRL.DS | SCR_EL3.FIQ | ICC_PMR_EL1 | Group 1 priority

drivers/irqchip/irq-mips-gic.c

+4 −0
Original line number Diff line number Diff line
@@ -783,6 +783,10 @@ static int __init gic_of_init(struct device_node *node, 
	}



	mips_gic_base = ioremap(gic_base, gic_len);

	if (!mips_gic_base) {

		pr_err("Failed to ioremap gic_base\n");

		return -ENOMEM;

	}



	gicconfig = read_gic_config();

	gic_shared_intrs = FIELD_GET(GIC_CONFIG_NUMINTERRUPTS, gicconfig);