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 | |
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>
-rw-r--r-- | arch/arm/mach-integrator/integrator_ap.c | 79 | ||||
-rw-r--r-- | arch/arm/mach-integrator/integrator_cp.c | 67 |
2 files changed, 122 insertions, 24 deletions
diff --git a/arch/arm/mach-integrator/integrator_ap.c b/arch/arm/mach-integrator/integrator_ap.c index 36e2b6eb67b7..f368b85f0447 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) |
diff --git a/arch/arm/mach-integrator/integrator_cp.c b/arch/arm/mach-integrator/integrator_cp.c index 2be5c03ab87f..aa34c58b96c4 100644 --- a/arch/arm/mach-integrator/integrator_cp.c +++ b/arch/arm/mach-integrator/integrator_cp.c | |||
@@ -74,17 +74,62 @@ | |||
74 | */ | 74 | */ |
75 | 75 | ||
76 | static struct map_desc intcp_io_desc[] __initdata = { | 76 | static struct map_desc intcp_io_desc[] __initdata = { |
77 | { IO_ADDRESS(INTEGRATOR_HDR_BASE), INTEGRATOR_HDR_BASE, SZ_4K, MT_DEVICE }, | 77 | { |
78 | { IO_ADDRESS(INTEGRATOR_SC_BASE), INTEGRATOR_SC_BASE, SZ_4K, MT_DEVICE }, | 78 | .virtual = IO_ADDRESS(INTEGRATOR_HDR_BASE), |
79 | { IO_ADDRESS(INTEGRATOR_EBI_BASE), INTEGRATOR_EBI_BASE, SZ_4K, MT_DEVICE }, | 79 | .pfn = __phys_to_pfn(INTEGRATOR_HDR_BASE), |
80 | { IO_ADDRESS(INTEGRATOR_CT_BASE), INTEGRATOR_CT_BASE, SZ_4K, MT_DEVICE }, | 80 | .length = SZ_4K, |
81 | { IO_ADDRESS(INTEGRATOR_IC_BASE), INTEGRATOR_IC_BASE, SZ_4K, MT_DEVICE }, | 81 | .type = MT_DEVICE |
82 | { IO_ADDRESS(INTEGRATOR_UART0_BASE), INTEGRATOR_UART0_BASE, SZ_4K, MT_DEVICE }, | 82 | }, { |
83 | { IO_ADDRESS(INTEGRATOR_UART1_BASE), INTEGRATOR_UART1_BASE, SZ_4K, MT_DEVICE }, | 83 | .virtual = IO_ADDRESS(INTEGRATOR_SC_BASE), |
84 | { IO_ADDRESS(INTEGRATOR_DBG_BASE), INTEGRATOR_DBG_BASE, SZ_4K, MT_DEVICE }, | 84 | .pfn = __phys_to_pfn(INTEGRATOR_SC_BASE), |
85 | { IO_ADDRESS(INTEGRATOR_GPIO_BASE), INTEGRATOR_GPIO_BASE, SZ_4K, MT_DEVICE }, | 85 | .length = SZ_4K, |
86 | { 0xfca00000, 0xca000000, SZ_4K, MT_DEVICE }, | 86 | .type = MT_DEVICE |
87 | { 0xfcb00000, 0xcb000000, SZ_4K, MT_DEVICE }, | 87 | }, { |
88 | .virtual = IO_ADDRESS(INTEGRATOR_EBI_BASE), | ||
89 | .pfn = __phys_to_pfn(INTEGRATOR_EBI_BASE), | ||
90 | .length = SZ_4K, | ||
91 | .type = MT_DEVICE | ||
92 | }, { | ||
93 | .virtual = IO_ADDRESS(INTEGRATOR_CT_BASE), | ||
94 | .pfn = __phys_to_pfn(INTEGRATOR_CT_BASE), | ||
95 | .length = SZ_4K, | ||
96 | .type = MT_DEVICE | ||
97 | }, { | ||
98 | .virtual = IO_ADDRESS(INTEGRATOR_IC_BASE), | ||
99 | .pfn = __phys_to_pfn(INTEGRATOR_IC_BASE), | ||
100 | .length = SZ_4K, | ||
101 | .type = MT_DEVICE | ||
102 | }, { | ||
103 | .virtual = IO_ADDRESS(INTEGRATOR_UART0_BASE), | ||
104 | .pfn = __phys_to_pfn(INTEGRATOR_UART0_BASE), | ||
105 | .length = SZ_4K, | ||
106 | .type = MT_DEVICE | ||
107 | }, { | ||
108 | .virtual = IO_ADDRESS(INTEGRATOR_UART1_BASE), | ||
109 | .pfn = __phys_to_pfn(INTEGRATOR_UART1_BASE), | ||
110 | .length = SZ_4K, | ||
111 | .type = MT_DEVICE | ||
112 | }, { | ||
113 | .virtual = IO_ADDRESS(INTEGRATOR_DBG_BASE), | ||
114 | .pfn = __phys_to_pfn(INTEGRATOR_DBG_BASE), | ||
115 | .length = SZ_4K, | ||
116 | .type = MT_DEVICE | ||
117 | }, { | ||
118 | .virtual = IO_ADDRESS(INTEGRATOR_GPIO_BASE), | ||
119 | .pfn = __phys_to_pfn(INTEGRATOR_GPIO_BASE), | ||
120 | .length = SZ_4K, | ||
121 | .type = MT_DEVICE | ||
122 | }, { | ||
123 | .virtual = 0xfca00000, | ||
124 | .pfn = __phys_to_pfn(0xca000000), | ||
125 | .length = SZ_4K, | ||
126 | .type = MT_DEVICE | ||
127 | }, { | ||
128 | .virtual = 0xfcb00000, | ||
129 | .pfn = __phys_to_pfn(0xcb000000), | ||
130 | .length = SZ_4K, | ||
131 | .type = MT_DEVICE | ||
132 | } | ||
88 | }; | 133 | }; |
89 | 134 | ||
90 | static void __init intcp_map_io(void) | 135 | static void __init intcp_map_io(void) |