Eric Lee / smarc-ti-linux-kernel

Download as
Browse Code ยป

Commit 1198365625bf22294263267df3360cb2a4c76f2d

Authored by Felipe Balbi
Committed by Tony Lindgren
1 parent 33ca0be083
Exists in ti-lsk-linux-4.1.y and in 10 other branches dlt-processor-sdk-linux-03.00.00.04, processor-sdk-linux-02.00.01, smarc-ti-lsk-linux-4.1.y, smarct3x-processor-sdk-04.01.00.06, smarct3x-processor-sdk-linux-02.00.01, smarct3x-processor-sdk-linux-03.00.00.04, smarct4x-800-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-04.01.00.06, smarct4x-processor-sdk-linux-02.00.01, smarct4x-processor-sdk-linux-03.00.00.04

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: Felipe Balbi <balbi@ti.com>
Signed-off-by: Tony Lindgren <tony@atomide.com>

Showing 1 changed file with 8 additions and 6 deletions Side-by-side Diff

arch/arm/mach-omap2/irq.c
Diff comments   View file @ 1198365
... ... @@ -41,11 +41,13 @@
41 41 #define INTC_MIR_CLEAR0 0x0088
42 42 #define INTC_MIR_SET0 0x008c
43 43 #define INTC_PENDING_IRQ0 0x0098
  44 +#define INTC_PENDING_IRQ1 0x00b8
  45 +#define INTC_PENDING_IRQ2 0x00d8
  46 +#define INTC_PENDING_IRQ3 0x00f8
44 47 #define INTC_ILR0 0x0100
45 48  
46 49 #define OMAP2_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP24XX_IC_BASE)
47 50 #define OMAP3_IRQ_BASE OMAP2_L4_IO_ADDRESS(OMAP34XX_IC_BASE)
48   -#define INTCPS_SIR_IRQ_OFFSET 0x0040 /* omap2/3 active interrupt offset */
49 51 #define ACTIVEIRQ_MASK 0x7f /* omap2/3 active interrupt bits */
50 52 #define INTCPS_NR_ILR_REGS 128
51 53 #define INTCPS_NR_MIR_REGS 3
52 54  
53 55  
54 56  
55 57  
... ... @@ -192,26 +194,26 @@
192 194 int handled_irq = 0;
193 195  
194 196 do {
195   - irqnr = readl_relaxed(base_addr + 0x98);
  197 + irqnr = intc_readl(INTC_PENDING_IRQ0);
196 198 if (irqnr)
197 199 goto out;
198 200  
199   - irqnr = readl_relaxed(base_addr + 0xb8);
  201 + irqnr = intc_readl(INTC_PENDING_IRQ1);
200 202 if (irqnr)
201 203 goto out;
202 204  
203   - irqnr = readl_relaxed(base_addr + 0xd8);
  205 + irqnr = intc_readl(INTC_PENDING_IRQ2);
204 206 #if IS_ENABLED(CONFIG_SOC_TI81XX) || IS_ENABLED(CONFIG_SOC_AM33XX)
205 207 if (irqnr)
206 208 goto out;
207   - irqnr = readl_relaxed(base_addr + 0xf8);
  209 + irqnr = intc_readl(INTC_PENDING_IRQ3);
208 210 #endif
209 211  
210 212 out:
211 213 if (!irqnr)
212 214 break;
213 215  
214   - irqnr = readl_relaxed(base_addr + INTCPS_SIR_IRQ_OFFSET);
  216 + irqnr = intc_readl(INTC_SIR);
215 217 irqnr &= ACTIVEIRQ_MASK;
216 218  
217 219 if (irqnr) {