diff options
| author | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@pobox.com> | 2005-10-28 18:48:57 -0400 |
| commit | 596c96ba06e5d56e72451e02f93f4e15e17458df (patch) | |
| tree | 78bc640acacb8faeb621c51296e99dbb0533a147 /arch/arm/mach-imx | |
| parent | ad18b0ea089928367185e13d11424aea91d4b41f (diff) | |
| parent | 20731945ae743034353a88c307920d1f16cf8ac8 (diff) | |
Merge branch 'master'
Diffstat (limited to 'arch/arm/mach-imx')
| -rw-r--r-- | arch/arm/mach-imx/generic.c | 8 | ||||
| -rw-r--r-- | arch/arm/mach-imx/mx1ads.c | 38 |
2 files changed, 37 insertions, 9 deletions
diff --git a/arch/arm/mach-imx/generic.c b/arch/arm/mach-imx/generic.c index f8a742bb2d5b..cb14b0682cef 100644 --- a/arch/arm/mach-imx/generic.c +++ b/arch/arm/mach-imx/generic.c | |||
| @@ -273,8 +273,12 @@ static struct platform_device *devices[] __initdata = { | |||
| 273 | }; | 273 | }; |
| 274 | 274 | ||
| 275 | static struct map_desc imx_io_desc[] __initdata = { | 275 | static struct map_desc imx_io_desc[] __initdata = { |
| 276 | /* virtual physical length type */ | 276 | { |
| 277 | {IMX_IO_BASE, IMX_IO_PHYS, IMX_IO_SIZE, MT_DEVICE}, | 277 | .virtual = IMX_IO_BASE, |
| 278 | .pfn = __phys_to_pfn(IMX_IO_PHYS), | ||
| 279 | .length = IMX_IO_SIZE, | ||
| 280 | .type = MT_DEVICE | ||
| 281 | } | ||
| 278 | }; | 282 | }; |
| 279 | 283 | ||
| 280 | void __init | 284 | void __init |
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 |