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>
34 lines
893 B
ArmAsm
34 lines
893 B
ArmAsm
/*
|
|
* include/asm-arm/arch-pxa/entry-macro.S
|
|
*
|
|
* Low-level IRQ helper macros for PXA-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>
|
|
|
|
.macro disable_fiq
|
|
.endm
|
|
|
|
.macro get_irqnr_and_base, irqnr, irqstat, base, tmp
|
|
#ifdef CONFIG_PXA27x
|
|
mrc p6, 0, \irqstat, c0, c0, 0 @ ICIP
|
|
mrc p6, 0, \irqnr, c1, c0, 0 @ ICMR
|
|
#else
|
|
mov \base, #io_p2v(0x40000000) @ IIR Ctl = 0x40d00000
|
|
add \base, \base, #0x00d00000
|
|
ldr \irqstat, [\base, #0] @ ICIP
|
|
ldr \irqnr, [\base, #4] @ ICMR
|
|
#endif
|
|
ands \irqnr, \irqstat, \irqnr
|
|
beq 1001f
|
|
rsb \irqstat, \irqnr, #0
|
|
and \irqstat, \irqstat, \irqnr
|
|
clz \irqnr, \irqstat
|
|
rsb \irqnr, \irqnr, #(31 - PXA_IRQ_SKIP)
|
|
1001:
|
|
.endm
|