Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 11983656 authored by Felipe Balbi's avatar Felipe Balbi Committed by Tony Lindgren
Browse files

arm: omap: irq: switch over to intc_readl on omap_intc_handle_irq 



an almost blind conversion from readl_relaxed
to our newly introduced intc_readl().

While at that, also remove some hardcoded
register addresses.

Signed-off-by: default avatarFelipe Balbi <balbi@ti.com>
Signed-off-by: default avatarTony Lindgren <tony@atomide.com>
parent 33ca0be0

arch/arm/mach-omap2/irq.c

+8 −6
Original line number Diff line number Diff line
@@ -41,11 +41,13 @@ 
#define INTC_MIR_CLEAR0		0x0088

#define INTC_MIR_SET0		0x008c

#define INTC_PENDING_IRQ0	0x0098

#define INTC_PENDING_IRQ1	0x00b8

#define INTC_PENDING_IRQ2	0x00d8

#define INTC_PENDING_IRQ3	0x00f8

#define INTC_ILR0		0x0100



#define OMAP2_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE)

#define OMAP3_IRQ_BASE		OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)

#define INTCPS_SIR_IRQ_OFFSET	0x0040	/* omap2/3 active interrupt offset */

#define ACTIVEIRQ_MASK		0x7f	/* omap2/3 active interrupt bits */

#define INTCPS_NR_ILR_REGS	128

#define INTCPS_NR_MIR_REGS	3
@@ -192,26 +194,26 @@ static inline void omap_intc_handle_irq(void __iomem *base_addr, struct pt_regs 
	int handled_irq = 0;



	do {

		irqnr = readl_relaxed(base_addr + 0x98);

		irqnr = intc_readl(INTC_PENDING_IRQ0);

		if (irqnr)

			goto out;



		irqnr = readl_relaxed(base_addr + 0xb8);

		irqnr = intc_readl(INTC_PENDING_IRQ1);

		if (irqnr)

			goto out;



		irqnr = readl_relaxed(base_addr + 0xd8);

		irqnr = intc_readl(INTC_PENDING_IRQ2);

#if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)

		if (irqnr)

			goto out;

		irqnr = readl_relaxed(base_addr + 0xf8);

		irqnr = intc_readl(INTC_PENDING_IRQ3);

#endif



out:

		if (!irqnr)

			break;



		irqnr = readl_relaxed(base_addr + INTCPS_SIR_IRQ_OFFSET);

		irqnr = intc_readl(INTC_SIR);

		irqnr &= ACTIVEIRQ_MASK;



		if (irqnr) {