From df96d1729fc438f767aa5fc5ff43a29c470ad2e9 Mon Sep 17 00:00:00 2001 From: Tony Lindgren Date: Tue, 17 Jun 2008 13:35:49 +0300 Subject: [PATCH] ARM: OMAP: Define interrupt register locally Rename to be less confusing name. Signed-off-by: Tony Lindgren --- include/asm-arm/arch-omap/entry-macro.S | 4 +++- include/asm-arm/arch-omap/omap24xx.h | 1 - include/asm-arm/arch-omap/omap34xx.h | 1 - 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/include/asm-arm/arch-omap/entry-macro.S b/include/asm-arm/arch-omap/entry-macro.S index 6c836e27fec..5951fdb9f8f 100644 --- a/include/asm-arm/arch-omap/entry-macro.S +++ b/include/asm-arm/arch-omap/entry-macro.S @@ -65,6 +65,8 @@ #include #endif +#define INTCPS_SIR_IRQ_OFFSET 0x0040 /* Active interrupt number */ + .macro disable_fiq .endm @@ -85,7 +87,7 @@ ldr \irqnr, [\base, #0xd8] /* IRQ pending reg 3 */ cmp \irqnr, #0x0 2222: - ldrne \irqnr, [\base, #IRQ_SIR_IRQ] + ldrne \irqnr, [\base, #INTCPS_SIR_IRQ_OFFSET] .endm diff --git a/include/asm-arm/arch-omap/omap24xx.h b/include/asm-arm/arch-omap/omap24xx.h index affe39bfe58..c985c422a37 100644 --- a/include/asm-arm/arch-omap/omap24xx.h +++ b/include/asm-arm/arch-omap/omap24xx.h @@ -39,7 +39,6 @@ /* interrupt controller */ #define OMAP24XX_IC_BASE (L4_24XX_BASE + 0xfe000) #define OMAP24XX_IVA_INTC_BASE 0x40000000 -#define IRQ_SIR_IRQ 0x0040 #define OMAP2420_CTRL_BASE L4_24XX_BASE #define OMAP2420_32KSYNCT_BASE (L4_24XX_BASE + 0x4000) diff --git a/include/asm-arm/arch-omap/omap34xx.h b/include/asm-arm/arch-omap/omap34xx.h index 6a0459ae5c0..aa30c6d10ab 100644 --- a/include/asm-arm/arch-omap/omap34xx.h +++ b/include/asm-arm/arch-omap/omap34xx.h @@ -53,7 +53,6 @@ #define OMAP34XX_HSUSB_OTG_BASE (L4_34XX_BASE + 0xAB000) #define OMAP34XX_HSUSB_HOST_BASE (L4_34XX_BASE + 0x64000) #define OMAP34XX_USBTLL_BASE (L4_34XX_BASE + 0x62000) -#define IRQ_SIR_IRQ 0x0040 #if defined(CONFIG_ARCH_OMAP3430) -- 2.41.1