diff options
| author | Greg KH <greg@press.(none)> | 2005-10-28 13:13:16 -0400 |
|---|---|---|
| committer | Greg Kroah-Hartman <gregkh@suse.de> | 2005-10-28 13:13:16 -0400 |
| commit | 6fbfddcb52d8d9fa2cd209f5ac2a1c87497d55b5 (patch) | |
| tree | c0414e89678fcef7ce3493e048d855bde781ae8d /arch/arm/mach-epxa10db/mm.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-epxa10db/mm.c')
| -rw-r--r-- | arch/arm/mach-epxa10db/mm.c | 37 |
1 files changed, 31 insertions, 6 deletions
diff --git a/arch/arm/mach-epxa10db/mm.c b/arch/arm/mach-epxa10db/mm.c index 2aa57fa46da3..e8832d0910ee 100644 --- a/arch/arm/mach-epxa10db/mm.c +++ b/arch/arm/mach-epxa10db/mm.c | |||
| @@ -31,12 +31,37 @@ | |||
| 31 | /* Page table mapping for I/O region */ | 31 | /* Page table mapping for I/O region */ |
| 32 | 32 | ||
| 33 | static struct map_desc epxa10db_io_desc[] __initdata = { | 33 | static struct map_desc epxa10db_io_desc[] __initdata = { |
| 34 | { IO_ADDRESS(EXC_REGISTERS_BASE), EXC_REGISTERS_BASE, SZ_16K, MT_DEVICE }, | 34 | { |
| 35 | { IO_ADDRESS(EXC_PLD_BLOCK0_BASE), EXC_PLD_BLOCK0_BASE, SZ_16K, MT_DEVICE }, | 35 | .virtual = IO_ADDRESS(EXC_REGISTERS_BASE), |
| 36 | { IO_ADDRESS(EXC_PLD_BLOCK1_BASE), EXC_PLD_BLOCK1_BASE, SZ_16K, MT_DEVICE }, | 36 | .pfn = __phys_to_pfn(EXC_REGISTERS_BASE), |
| 37 | { IO_ADDRESS(EXC_PLD_BLOCK2_BASE), EXC_PLD_BLOCK2_BASE, SZ_16K, MT_DEVICE }, | 37 | .length = SZ_16K, |
| 38 | { IO_ADDRESS(EXC_PLD_BLOCK3_BASE), EXC_PLD_BLOCK3_BASE, SZ_16K, MT_DEVICE }, | 38 | .type = MT_DEVICE |
| 39 | { FLASH_VADDR(EXC_EBI_BLOCK0_BASE), EXC_EBI_BLOCK0_BASE, SZ_16M, MT_DEVICE } | 39 | }, { |
| 40 | .virtual = IO_ADDRESS(EXC_PLD_BLOCK0_BASE), | ||
| 41 | .pfn = __phys_to_pfn(EXC_PLD_BLOCK0_BASE), | ||
| 42 | .length = SZ_16K, | ||
| 43 | .type = MT_DEVICE | ||
| 44 | }, { | ||
| 45 | .virtual = IO_ADDRESS(EXC_PLD_BLOCK1_BASE), | ||
| 46 | .pfn =__phys_to_pfn(EXC_PLD_BLOCK1_BASE), | ||
| 47 | .length = SZ_16K, | ||
| 48 | .type = MT_DEVICE | ||
| 49 | }, { | ||
| 50 | .virtual = IO_ADDRESS(EXC_PLD_BLOCK2_BASE), | ||
| 51 | .physical = __phys_to_pfn(EXC_PLD_BLOCK2_BASE), | ||
| 52 | .length = SZ_16K, | ||
| 53 | .type = MT_DEVICE | ||
| 54 | }, { | ||
| 55 | .virtual = IO_ADDRESS(EXC_PLD_BLOCK3_BASE), | ||
| 56 | .pfn = __phys_to_pfn(EXC_PLD_BLOCK3_BASE), | ||
| 57 | .length = SZ_16K, | ||
| 58 | .type = MT_DEVICE | ||
| 59 | }, { | ||
| 60 | .virtual = FLASH_VADDR(EXC_EBI_BLOCK0_BASE), | ||
| 61 | .pfn = __phys_to_pfn(EXC_EBI_BLOCK0_BASE), | ||
| 62 | .length = SZ_16M, | ||
| 63 | .type = MT_DEVICE | ||
| 64 | } | ||
| 40 | }; | 65 | }; |
| 41 | 66 | ||
| 42 | void __init epxa10db_map_io(void) | 67 | void __init epxa10db_map_io(void) |