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-sa1100/h3600.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-sa1100/h3600.c')
| -rw-r--r-- | arch/arm/mach-sa1100/h3600.c | 20 |
1 files changed, 16 insertions, 4 deletions
diff --git a/arch/arm/mach-sa1100/h3600.c b/arch/arm/mach-sa1100/h3600.c index e7aa2681ca64..e8352b7f74b0 100644 --- a/arch/arm/mach-sa1100/h3600.c +++ b/arch/arm/mach-sa1100/h3600.c | |||
| @@ -223,10 +223,22 @@ static void h3xxx_lcd_power(int enable) | |||
| 223 | } | 223 | } |
| 224 | 224 | ||
| 225 | static struct map_desc h3600_io_desc[] __initdata = { | 225 | static struct map_desc h3600_io_desc[] __initdata = { |
| 226 | /* virtual physical length type */ | 226 | { /* static memory bank 2 CS#2 */ |
| 227 | { H3600_BANK_2_VIRT, SA1100_CS2_PHYS, 0x02800000, MT_DEVICE }, /* static memory bank 2 CS#2 */ | 227 | .virtual = H3600_BANK_2_VIRT, |
| 228 | { H3600_BANK_4_VIRT, SA1100_CS4_PHYS, 0x00800000, MT_DEVICE }, /* static memory bank 4 CS#4 */ | 228 | .pfn = __phys_to_pfn(SA1100_CS2_PHYS), |
| 229 | { H3600_EGPIO_VIRT, H3600_EGPIO_PHYS, 0x01000000, MT_DEVICE }, /* EGPIO 0 CS#5 */ | 229 | .length = 0x02800000, |
| 230 | .type = MT_DEVICE | ||
| 231 | }, { /* static memory bank 4 CS#4 */ | ||
| 232 | .virtual = H3600_BANK_4_VIRT, | ||
| 233 | .pfn = __phys_to_pfn(SA1100_CS4_PHYS), | ||
| 234 | .length = 0x00800000, | ||
| 235 | .type = MT_DEVICE | ||
| 236 | }, { /* EGPIO 0 CS#5 */ | ||
| 237 | .virtual = H3600_EGPIO_VIRT, | ||
| 238 | .pfn = __phys_to_pfn(H3600_EGPIO_PHYS), | ||
| 239 | .length = 0x01000000, | ||
| 240 | .type = MT_DEVICE | ||
| 241 | } | ||
| 230 | }; | 242 | }; |
| 231 | 243 | ||
| 232 | /* | 244 | /* |