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-imx/mx1ads.c | |
| parent | 1a222bca26ca691e83be1b08f5e96ae96d0d8cae (diff) | |
| parent | 27d1097d39509494706eaa2620ef3b1e780a3224 (diff) | |
Merge ../bleed-2.6
Diffstat (limited to 'arch/arm/mach-imx/mx1ads.c')
| -rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 38 |
1 files changed, 31 insertions, 7 deletions
diff --git a/arch/arm/mach-imx/mx1ads.c b/arch/arm/mach-imx/mx1ads.c index a7511ddfe364..4cbdc1fe04b1 100644 --- a/arch/arm/mach-imx/mx1ads.c +++ b/arch/arm/mach-imx/mx1ads.c | |||
| @@ -61,13 +61,37 @@ mx1ads_init(void) | |||
| 61 | } | 61 | } |
| 62 | 62 | ||
| 63 | static struct map_desc mx1ads_io_desc[] __initdata = { | 63 | static struct map_desc mx1ads_io_desc[] __initdata = { |
| 64 | /* virtual physical length type */ | 64 | { |
| 65 | {IMX_CS0_VIRT, IMX_CS0_PHYS, IMX_CS0_SIZE, MT_DEVICE}, | 65 | .virtual = IMX_CS0_VIRT, |
| 66 | {IMX_CS1_VIRT, IMX_CS1_PHYS, IMX_CS1_SIZE, MT_DEVICE}, | 66 | .pfn = __phys_to_pfn(IMX_CS0_PHYS), |
| 67 | {IMX_CS2_VIRT, IMX_CS2_PHYS, IMX_CS2_SIZE, MT_DEVICE}, | 67 | .length = IMX_CS0_SIZE, |
| 68 | {IMX_CS3_VIRT, IMX_CS3_PHYS, IMX_CS3_SIZE, MT_DEVICE}, | 68 | .type = MT_DEVICE |
| 69 | {IMX_CS4_VIRT, IMX_CS4_PHYS, IMX_CS4_SIZE, MT_DEVICE}, | 69 | }, { |
| 70 | {IMX_CS5_VIRT, IMX_CS5_PHYS, IMX_CS5_SIZE, MT_DEVICE}, | 70 | .virtual = IMX_CS1_VIRT, |
| 71 | .pfn = __phys_to_pfn(IMX_CS1_PHYS), | ||
| 72 | .length = IMX_CS1_SIZE, | ||
| 73 | .type = MT_DEVICE | ||
| 74 | }, { | ||
| 75 | .virtual = IMX_CS2_VIRT, | ||
| 76 | .pfn = __phys_to_pfn(IMX_CS2_PHYS), | ||
| 77 | .length = IMX_CS2_SIZE, | ||
| 78 | .type = MT_DEVICE | ||
| 79 | }, { | ||
| 80 | .virtual = IMX_CS3_VIRT, | ||
| 81 | .pfn = __phys_to_pfn(IMX_CS3_PHYS), | ||
| 82 | .length = IMX_CS3_SIZE, | ||
| 83 | .type = MT_DEVICE | ||
| 84 | }, { | ||
| 85 | .virtual = IMX_CS4_VIRT, | ||
| 86 | .pfn = __phys_to_pfn(IMX_CS4_PHYS), | ||
| 87 | .length = IMX_CS4_SIZE, | ||
| 88 | .type = MT_DEVICE | ||
| 89 | }, { | ||
| 90 | .virtual = IMX_CS5_VIRT, | ||
| 91 | .pfn = __phys_to_pfn(IMX_CS5_PHYS), | ||
| 92 | .length = IMX_CS5_SIZE, | ||
| 93 | .type = MT_DEVICE | ||
| 94 | } | ||
| 71 | }; | 95 | }; |
| 72 | 96 | ||
| 73 | static void __init | 97 | static void __init |