diff options
| author | Deepak Saxena <dsaxena@plexity.net> | 2005-10-28 10:19:10 -0400 |
|---|---|---|
| committer | Russell King <rmk+kernel@arm.linux.org.uk> | 2005-10-28 10:19:10 -0400 |
| commit | c8d2729858d76de4ef7522c8171004fc1959cc44 (patch) | |
| tree | 1ee360c926ef6544b7a1701fe4558ddab1824733 /arch/arm/mach-integrator/integrator_ap.c | |
| parent | adecef744fc5b4e9316c851feec2a4d2640dd7ae (diff) | |
[ARM] 3001/1: Replace map_desc.physical with map_desc.pfn: Integrator
Patch from Deepak Saxena
Integrator map_desc.pfn conversion
Signed-off-by: Deepak Saxena <dsaxena@plexity.net>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Diffstat (limited to 'arch/arm/mach-integrator/integrator_ap.c')
| -rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 79 |
1 files changed, 66 insertions, 13 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 36e2b6eb67b..f368b85f044 100644 --- a/arch/arm/mach-integrator/integrator_ap.c +++ b/arch/arm/mach-integrator/integrator_ap.c | |||
| @@ -75,19 +75,72 @@ | |||
| 75 | */ | 75 | */ |
| 76 | 76 | ||
| 77 | static struct map_desc ap_io_desc[] __initdata = { | 77 | static struct map_desc ap_io_desc[] __initdata = { |
| 78 | { IO_ADDRESS(INTEGRATOR_HDR_BASE), INTEGRATOR_HDR_BASE, SZ_4K, MT_DEVICE }, | 78 | { |
| 79 | { IO_ADDRESS(INTEGRATOR_SC_BASE), INTEGRATOR_SC_BASE, SZ_4K, MT_DEVICE }, | 79 | .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), |
| 80 | { IO_ADDRESS(INTEGRATOR_EBI_BASE), INTEGRATOR_EBI_BASE, SZ_4K, MT_DEVICE }, | 80 | .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), |
| 81 | { IO_ADDRESS(INTEGRATOR_CT_BASE), INTEGRATOR_CT_BASE, SZ_4K, MT_DEVICE }, | 81 | .length = SZ_4K, |
| 82 | { IO_ADDRESS(INTEGRATOR_IC_BASE), INTEGRATOR_IC_BASE, SZ_4K, MT_DEVICE }, | 82 | .type = MT_DEVICE |
| 83 | { IO_ADDRESS(INTEGRATOR_UART0_BASE), INTEGRATOR_UART0_BASE, SZ_4K, MT_DEVICE }, | 83 | }, { |
| 84 | { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K, MT_DEVICE }, | 84 | .virtual = IO_ADDRESS(INTEGRATOR_SC_BASE), |
| 85 | { IO_ADDRESS(INTEGRATOR_DBG_BASE), INTEGRATOR_DBG_BASE, SZ_4K, MT_DEVICE }, | 85 | .pfn = __phys_to_pfn(INTEGRATOR_SC_BASE), |
| 86 | { IO_ADDRESS(INTEGRATOR_GPIO_BASE), INTEGRATOR_GPIO_BASE, SZ_4K, MT_DEVICE }, | 86 | .length = SZ_4K, |
| 87 | { PCI_MEMORY_VADDR, PHYS_PCI_MEM_BASE, SZ_16M, MT_DEVICE }, | 87 | .type = MT_DEVICE |
| 88 | { PCI_CONFIG_VADDR, PHYS_PCI_CONFIG_BASE, SZ_16M, MT_DEVICE }, | 88 | }, { |
| 89 | { PCI_V3_VADDR, PHYS_PCI_V3_BASE, SZ_64K, MT_DEVICE }, | 89 | .virtual = IO_ADDRESS(INTEGRATOR_EBI_BASE), |
| 90 | { PCI_IO_VADDR, PHYS_PCI_IO_BASE, SZ_64K, MT_DEVICE } | 90 | .pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE), |
| 91 | .length = SZ_4K, | ||
| 92 | .type = MT_DEVICE | ||
| 93 | }, { | ||
| 94 | .virtual = IO_ADDRESS(INTEGRATOR_CT_BASE), | ||
| 95 | .pfn = __phys_to_pfn(INTEGRATOR_CT_BASE), | ||
| 96 | .length = SZ_4K, | ||
| 97 | .type = MT_DEVICE | ||
| 98 | }, { | ||
| 99 | .virtual = IO_ADDRESS(INTEGRATOR_IC_BASE), | ||
| 100 | .pfn = __phys_to_pfn(INTEGRATOR_IC_BASE), | ||
| 101 | .length = SZ_4K, | ||
| 102 | .type = MT_DEVICE | ||
| 103 | }, { | ||
| 104 | .virtual = IO_ADDRESS(INTEGRATOR_UART0_BASE), | ||
| 105 | .pfn = __phys_to_pfn(INTEGRATOR_UART0_BASE), | ||
| 106 | .length = SZ_4K, | ||
| 107 | .type = MT_DEVICE | ||
| 108 | }, { | ||
| 109 | .virtual = IO_ADDRESS(INTEGRATOR_UART1_BASE), | ||
| 110 | .pfn = __phys_to_pfn(INTEGRATOR_UART1_BASE), | ||
| 111 | .length = SZ_4K, | ||
| 112 | .type = MT_DEVICE | ||
| 113 | }, { | ||
| 114 | .virtual = IO_ADDRESS(INTEGRATOR_DBG_BASE), | ||
| 115 | .pfn = __phys_to_pfn(INTEGRATOR_DBG_BASE), | ||
| 116 | .length = SZ_4K, | ||
| 117 | .type = MT_DEVICE | ||
| 118 | }, { | ||
| 119 | .virtual = IO_ADDRESS(INTEGRATOR_GPIO_BASE), | ||
| 120 | .pfn = __phys_to_pfn(INTEGRATOR_GPIO_BASE), | ||
| 121 | .length = SZ_4K, | ||
| 122 | .type = MT_DEVICE | ||
| 123 | }, { | ||
| 124 | .virtual = PCI_MEMORY_VADDR, | ||
| 125 | .pfn = __phys_to_pfn(PHYS_PCI_MEM_BASE), | ||
| 126 | .length = SZ_16M, | ||
| 127 | .type = MT_DEVICE | ||
| 128 | }, { | ||
| 129 | .virtual = PCI_CONFIG_VADDR, | ||
| 130 | .pfn = __phys_to_pfn(PHYS_PCI_CONFIG_BASE), | ||
| 131 | .length = SZ_16M, | ||
| 132 | .type = MT_DEVICE | ||
| 133 | }, { | ||
| 134 | .virtual = PCI_V3_VADDR, | ||
| 135 | .pfn = __phys_to_pfn(PHYS_PCI_V3_BASE), | ||
| 136 | .length = SZ_64K, | ||
| 137 | .type = MT_DEVICE | ||
| 138 | }, { | ||
| 139 | .virtual = PCI_IO_VADDR, | ||
| 140 | .pfn = __phys_to_pfn(PHYS_PCI_IO_BASE), | ||
| 141 | .length = SZ_64K, | ||
| 142 | .type = MT_DEVICE | ||
| 143 | } | ||
| 91 | }; | 144 | }; |
| 92 | 145 | ||
| 93 | static void __init ap_map_io(void) | 146 | static void __init ap_map_io(void) |