78ff18a412
arch/arm/kernel/entry-armv.S has contained a comment suggesting that asm/hardware.h and asm/arch/irqs.h should be moved into the asm/arch/entry-macro.S include. So move the includes to these two files as required. Add missing includes (asm/hardware.h, asm/io.h) to asm/arch/system.h includes which use those facilities, and remove asm/io.h from kernel/process.c. Remove other unnecessary includes from arch/arm/kernel, arch/arm/mm and arch/arm/mach-footbridge. Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
77 lines
1.9 KiB
ArmAsm
77 lines
1.9 KiB
ArmAsm
/*
|
|
* include/asm-arm/arch-omap/entry-macro.S
|
|
*
|
|
* Low-level IRQ helper macros for OMAP-based platforms
|
|
*
|
|
* This file is licensed under the terms of the GNU General Public
|
|
* License version 2. This program is licensed "as is" without any
|
|
* warranty of any kind, whether express or implied.
|
|
*/
|
|
#include <asm/hardware.h>
|
|
#include <asm/arch/irqs.h>
|
|
|
|
#if defined(CONFIG_ARCH_OMAP1)
|
|
|
|
#if defined(CONFIG_ARCH_OMAP730) && \
|
|
(defined(CONFIG_ARCH_OMAP15XX) || defined(CONFIG_ARCH_OMAP16XX))
|
|
#error "FIXME: OMAP730 doesn't support multiple-OMAP"
|
|
#elif defined(CONFIG_ARCH_OMAP730)
|
|
#define INT_IH2_IRQ INT_730_IH2_IRQ
|
|
#elif defined(CONFIG_ARCH_OMAP15XX)
|
|
#define INT_IH2_IRQ INT_1510_IH2_IRQ
|
|
#elif defined(CONFIG_ARCH_OMAP16XX)
|
|
#define INT_IH2_IRQ INT_1610_IH2_IRQ
|
|
#else
|
|
#warning "IH2 IRQ defaulted"
|
|
#define INT_IH2_IRQ INT_1510_IH2_IRQ
|
|
#endif
|
|
|
|
.macro disable_fiq
|
|
.endm
|
|
|
|
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
|
|
ldr \base, =IO_ADDRESS(OMAP_IH1_BASE)
|
|
ldr \irqnr, [\base, #IRQ_ITR_REG_OFFSET]
|
|
ldr \tmp, [\base, #IRQ_MIR_REG_OFFSET]
|
|
mov \irqstat, #0xffffffff
|
|
bic \tmp, \irqstat, \tmp
|
|
tst \irqnr, \tmp
|
|
beq 1510f
|
|
|
|
ldr \irqnr, [\base, #IRQ_SIR_FIQ_REG_OFFSET]
|
|
cmp \irqnr, #0
|
|
ldreq \irqnr, [\base, #IRQ_SIR_IRQ_REG_OFFSET]
|
|
cmpeq \irqnr, #INT_IH2_IRQ
|
|
ldreq \base, =IO_ADDRESS(OMAP_IH2_BASE)
|
|
ldreq \irqnr, [\base, #IRQ_SIR_IRQ_REG_OFFSET]
|
|
addeqs \irqnr, \irqnr, #32
|
|
1510:
|
|
.endm
|
|
|
|
#elif defined(CONFIG_ARCH_OMAP24XX)
|
|
|
|
#include <asm/arch/omap24xx.h>
|
|
|
|
.macro disable_fiq
|
|
.endm
|
|
|
|
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
|
|
ldr \base, =VA_IC_BASE
|
|
ldr \irqnr, [\base, #0x98] /* IRQ pending reg 1 */
|
|
cmp \irqnr, #0x0
|
|
bne 2222f
|
|
ldr \irqnr, [\base, #0xb8] /* IRQ pending reg 2 */
|
|
cmp \irqnr, #0x0
|
|
bne 2222f
|
|
ldr \irqnr, [\base, #0xd8] /* IRQ pending reg 3 */
|
|
cmp \irqnr, #0x0
|
|
2222:
|
|
ldrne \irqnr, [\base, #IRQ_SIR_IRQ]
|
|
|
|
.endm
|
|
|
|
.macro irq_prio_table
|
|
.endm
|
|
|
|
#endif
|