diff options
author | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 16:19:17 -0500 |
---|---|---|
committer | Linus Torvalds <torvalds@woody.linux-foundation.org> | 2007-02-26 16:19:17 -0500 |
commit | 038c068f63a950c3a6ccfa814831ccac0ad48fb1 (patch) | |
tree | 29389a8d23dd5e29012ac289920df27ade357857 /include/asm-arm | |
parent | 5992fd1995a5e69710011fc7d7945c62bf5b551b (diff) | |
parent | e41698894d3fe64f17fe411e3e5ef3c2537bf2e6 (diff) |
Merge master.kernel.org:/home/rmk/linux-2.6-arm
* master.kernel.org:/home/rmk/linux-2.6-arm:
[ARM] CLPS7500 doesn't have IO ports
[ARM] Fix more apm-emulation.h
[ARM] 4234/1: Introduce get_irqnr_preamble and arch_ret_to_user for ns9xxx.
[ARM] 4233/1: nand/s3c2410.c: warning fix
[ARM] 4226/1: initial .data and .bss mappings of XIP kernel should be TEXT_OFFSET
[ARM] 4224/2: allow XIP kernel to boot again
[ARM] 4232/1: AT91: Generic GPIO bug
[ARM] 4231/1: AT91: Merge and typo fixes.
[ARM] 4229/1: S3C2410: Add MACH_QT2410 to s3c2410_defconfig
[ARM] 4228/2: S3C24XX: update s3c2410_defconfig for 2.6.21-rc1
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-at91/hardware.h | 2 | ||||
-rw-r--r-- | include/asm-arm/arch-at91rm9200/entry-macro.S | 32 | ||||
-rw-r--r-- | include/asm-arm/arch-ns9xxx/entry-macro.S | 6 |
3 files changed, 7 insertions, 33 deletions
diff --git a/include/asm-arm/arch-at91/hardware.h b/include/asm-arm/arch-at91/hardware.h index eaaf1c12b753..28133e0154dd 100644 --- a/include/asm-arm/arch-at91/hardware.h +++ b/include/asm-arm/arch-at91/hardware.h | |||
@@ -31,7 +31,7 @@ | |||
31 | 31 | ||
32 | /* | 32 | /* |
33 | * Remap the peripherals from address 0xFFF78000 .. 0xFFFFFFFF | 33 | * Remap the peripherals from address 0xFFF78000 .. 0xFFFFFFFF |
34 | * to 0xFEF78000 .. 0xFF000000. (5444Kb) | 34 | * to 0xFEF78000 .. 0xFF000000. (544Kb) |
35 | */ | 35 | */ |
36 | #define AT91_IO_PHYS_BASE 0xFFF78000 | 36 | #define AT91_IO_PHYS_BASE 0xFFF78000 |
37 | #define AT91_IO_SIZE (0xFFFFFFFF - AT91_IO_PHYS_BASE + 1) | 37 | #define AT91_IO_SIZE (0xFFFFFFFF - AT91_IO_PHYS_BASE + 1) |
diff --git a/include/asm-arm/arch-at91rm9200/entry-macro.S b/include/asm-arm/arch-at91rm9200/entry-macro.S deleted file mode 100644 index 0e0aadf2a175..000000000000 --- a/include/asm-arm/arch-at91rm9200/entry-macro.S +++ /dev/null | |||
@@ -1,32 +0,0 @@ | |||
1 | /* | ||
2 | * include/asm-arm/arch-at91rm9200/entry-macro.S | ||
3 | * | ||
4 | * Copyright (C) 2003-2005 SAN People | ||
5 | * | ||
6 | * Low-level IRQ helper macros for AT91RM9200 platforms | ||
7 | * | ||
8 | * This file is licensed under the terms of the GNU General Public | ||
9 | * License version 2. This program is licensed "as is" without any | ||
10 | * warranty of any kind, whether express or implied. | ||
11 | */ | ||
12 | |||
13 | #include <asm/hardware.h> | ||
14 | #include <asm/arch/at91_aic.h> | ||
15 | |||
16 | .macro disable_fiq | ||
17 | .endm | ||
18 | |||
19 | .macro get_irqnr_preamble, base, tmp | ||
20 | .endm | ||
21 | |||
22 | .macro arch_ret_to_user, tmp1, tmp2 | ||
23 | .endm | ||
24 | |||
25 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | ||
26 | ldr \base, =(AT91_VA_BASE_SYS) @ base virtual address of SYS peripherals | ||
27 | ldr \irqnr, [\base, #AT91_AIC_IVR] @ read IRQ vector register: de-asserts nIRQ to processor (and clears interrupt) | ||
28 | ldr \irqstat, [\base, #AT91_AIC_ISR] @ read interrupt source number | ||
29 | teq \irqstat, #0 @ ISR is 0 when no current interrupt, or spurious interrupt | ||
30 | streq \tmp, [\base, #AT91_AIC_EOICR] @ not going to be handled further, then ACK it now. | ||
31 | .endm | ||
32 | |||
diff --git a/include/asm-arm/arch-ns9xxx/entry-macro.S b/include/asm-arm/arch-ns9xxx/entry-macro.S index 467a1986d259..86aec87303e4 100644 --- a/include/asm-arm/arch-ns9xxx/entry-macro.S +++ b/include/asm-arm/arch-ns9xxx/entry-macro.S | |||
@@ -11,6 +11,12 @@ | |||
11 | #include <asm/hardware.h> | 11 | #include <asm/hardware.h> |
12 | #include <asm/arch-ns9xxx/regs-sys.h> | 12 | #include <asm/arch-ns9xxx/regs-sys.h> |
13 | 13 | ||
14 | .macro get_irqnr_preamble, base, tmp | ||
15 | .endm | ||
16 | |||
17 | .macro arch_ret_to_user, tmp1, tmp2 | ||
18 | .endm | ||
19 | |||
14 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp | 20 | .macro get_irqnr_and_base, irqnr, irqstat, base, tmp |
15 | ldr \base, =SYS_ISRADDR | 21 | ldr \base, =SYS_ISRADDR |
16 | ldr \irqstat, [\base, #(SYS_ISA - SYS_ISRADDR)] | 22 | ldr \irqstat, [\base, #(SYS_ISA - SYS_ISRADDR)] |