aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mx3/pcm037.c
diff options
context:
space:
mode:
authorSascha Hauer <s.hauer@pengutronix.de>2009-02-06 12:15:06 -0500
committerSascha Hauer <s.hauer@pengutronix.de>2009-03-13 05:34:30 -0400
commitfb4416ad61e4dac816ae866999115500c818406b (patch)
tree7c727464a91aa1b94c3f18e2942546f352518342 /arch/arm/mach-mx3/pcm037.c
parentcb88214d726b337d49c1f65cbc5e5ac85837b11b (diff)
[ARM] MX31: Move static virtual mappings of AIPS1/2 to common file
On MX31 we can't do much without mapping the AIPS1/2 register space. Move these mappings from individual boards to plat-mxc/mm.c Signed-off-by: Sascha Hauer <s.hauer@pengutronix.de>
Diffstat (limited to 'arch/arm/mach-mx3/pcm037.c')
-rw-r--r--arch/arm/mach-mx3/pcm037.c28
1 files changed, 1 insertions, 27 deletions
diff --git a/arch/arm/mach-mx3/pcm037.c b/arch/arm/mach-mx3/pcm037.c
index a05e37b731be..7743c13bebad 100644
--- a/arch/arm/mach-mx3/pcm037.c
+++ b/arch/arm/mach-mx3/pcm037.c
@@ -210,32 +210,6 @@ static void __init mxc_board_init(void)
210 mxc_register_device(&mxc_nand_device, &pcm037_nand_board_info); 210 mxc_register_device(&mxc_nand_device, &pcm037_nand_board_info);
211} 211}
212 212
213/*
214 * This structure defines static mappings for the pcm037 board.
215 */
216static struct map_desc pcm037_io_desc[] __initdata = {
217 {
218 .virtual = AIPS1_BASE_ADDR_VIRT,
219 .pfn = __phys_to_pfn(AIPS1_BASE_ADDR),
220 .length = AIPS1_SIZE,
221 .type = MT_DEVICE_NONSHARED
222 }, {
223 .virtual = AIPS2_BASE_ADDR_VIRT,
224 .pfn = __phys_to_pfn(AIPS2_BASE_ADDR),
225 .length = AIPS2_SIZE,
226 .type = MT_DEVICE_NONSHARED
227 },
228};
229
230/*
231 * Set up static virtual mappings.
232 */
233void __init pcm037_map_io(void)
234{
235 mxc_map_io();
236 iotable_init(pcm037_io_desc, ARRAY_SIZE(pcm037_io_desc));
237}
238
239static void __init pcm037_timer_init(void) 213static void __init pcm037_timer_init(void)
240{ 214{
241 mx31_clocks_init(26000000); 215 mx31_clocks_init(26000000);
@@ -250,7 +224,7 @@ MACHINE_START(PCM037, "Phytec Phycore pcm037")
250 .phys_io = AIPS1_BASE_ADDR, 224 .phys_io = AIPS1_BASE_ADDR,
251 .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, 225 .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc,
252 .boot_params = PHYS_OFFSET + 0x100, 226 .boot_params = PHYS_OFFSET + 0x100,
253 .map_io = pcm037_map_io, 227 .map_io = mxc_map_io,
254 .init_irq = mxc_init_irq, 228 .init_irq = mxc_init_irq,
255 .init_machine = mxc_board_init, 229 .init_machine = mxc_board_init,
256 .timer = &pcm037_timer, 230 .timer = &pcm037_timer,