diff options
author | Lennert Buytenhek <buytenh@wantstofly.org> | 2006-09-18 18:12:53 -0400 |
---|---|---|
committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2006-09-25 05:25:37 -0400 |
commit | 7ae1f7ec525c32db441836ab0ab010b85cb819a2 (patch) | |
tree | 25d87bd43198bdc3868c20cf3e8d44e8e343f0e6 /include/asm-arm | |
parent | 3f7e5815f4b774270e6506962de37af85aa9c830 (diff) |
[ARM] 3818/1: iop3xx: introduce arch/arm/plat-iop for shared iop32x/iop33x code
Introduce the arch/arm/plat-iop directory, for code shared between the
iop32x and iop33x, and move the common memory map setup bits there.
Signed-off-by: Lennert Buytenhek <buytenh@wantstofly.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'include/asm-arm')
-rw-r--r-- | include/asm-arm/arch-iop32x/iop321.h | 1 | ||||
-rw-r--r-- | include/asm-arm/arch-iop33x/iop331.h | 1 | ||||
-rw-r--r-- | include/asm-arm/hardware/iop3xx.h | 43 |
3 files changed, 43 insertions, 2 deletions
diff --git a/include/asm-arm/arch-iop32x/iop321.h b/include/asm-arm/arch-iop32x/iop321.h index 7ba93faf8da4..307272b07809 100644 --- a/include/asm-arm/arch-iop32x/iop321.h +++ b/include/asm-arm/arch-iop32x/iop321.h | |||
@@ -333,7 +333,6 @@ | |||
333 | 333 | ||
334 | 334 | ||
335 | #ifndef __ASSEMBLY__ | 335 | #ifndef __ASSEMBLY__ |
336 | extern void iop321_map_io(void); | ||
337 | extern void iop321_init_irq(void); | 336 | extern void iop321_init_irq(void); |
338 | extern void iop321_time_init(void); | 337 | extern void iop321_time_init(void); |
339 | #endif | 338 | #endif |
diff --git a/include/asm-arm/arch-iop33x/iop331.h b/include/asm-arm/arch-iop33x/iop331.h index 780b707edb1e..21430f877ea7 100644 --- a/include/asm-arm/arch-iop33x/iop331.h +++ b/include/asm-arm/arch-iop33x/iop331.h | |||
@@ -350,7 +350,6 @@ | |||
350 | 350 | ||
351 | 351 | ||
352 | #ifndef __ASSEMBLY__ | 352 | #ifndef __ASSEMBLY__ |
353 | extern void iop331_map_io(void); | ||
354 | extern void iop331_init_irq(void); | 353 | extern void iop331_init_irq(void); |
355 | extern void iop331_time_init(void); | 354 | extern void iop331_time_init(void); |
356 | #endif | 355 | #endif |
diff --git a/include/asm-arm/hardware/iop3xx.h b/include/asm-arm/hardware/iop3xx.h new file mode 100644 index 000000000000..c17cc19cdfab --- /dev/null +++ b/include/asm-arm/hardware/iop3xx.h | |||
@@ -0,0 +1,43 @@ | |||
1 | /* | ||
2 | * include/asm-arm/hardware/iop3xx.h | ||
3 | * | ||
4 | * Intel IOP32X and IOP33X register definitions | ||
5 | * | ||
6 | * Author: Rory Bolt <rorybolt@pacbell.net> | ||
7 | * Copyright (C) 2002 Rory Bolt | ||
8 | * Copyright (C) 2004 Intel Corp. | ||
9 | * | ||
10 | * This program is free software; you can redistribute it and/or modify | ||
11 | * it under the terms of the GNU General Public License version 2 as | ||
12 | * published by the Free Software Foundation. | ||
13 | */ | ||
14 | |||
15 | #ifndef __IOP3XX_H | ||
16 | #define __IOP3XX_H | ||
17 | |||
18 | /* | ||
19 | * IOP3XX processor registers | ||
20 | */ | ||
21 | #define IOP3XX_PERIPHERAL_PHYS_BASE 0xffffe000 | ||
22 | #define IOP3XX_PERIPHERAL_VIRT_BASE 0xfeffe000 | ||
23 | #define IOP3XX_PERIPHERAL_SIZE 0x00002000 | ||
24 | #define IOP3XX_REG_ADDR(reg) (IOP3XX_PERIPHERAL_VIRT_BASE + (reg)) | ||
25 | |||
26 | |||
27 | /* | ||
28 | * IOP3XX I/O and Mem space regions for PCI autoconfiguration | ||
29 | */ | ||
30 | #define IOP3XX_PCI_MEM_WINDOW_SIZE 0x04000000 | ||
31 | #define IOP3XX_PCI_LOWER_MEM_PA 0x80000000 | ||
32 | |||
33 | #define IOP3XX_PCI_IO_WINDOW_SIZE 0x00010000 | ||
34 | #define IOP3XX_PCI_LOWER_IO_PA 0x90000000 | ||
35 | #define IOP3XX_PCI_LOWER_IO_VA 0xfe000000 | ||
36 | |||
37 | |||
38 | #ifndef __ASSEMBLY__ | ||
39 | void iop3xx_map_io(void); | ||
40 | #endif | ||
41 | |||
42 | |||
43 | #endif | ||