diff options
author | Sascha Hauer <s.hauer@pengutronix.de> | 2009-02-06 12:15:06 -0500 |
---|---|---|
committer | Sascha Hauer <s.hauer@pengutronix.de> | 2009-03-13 05:34:30 -0400 |
commit | fb4416ad61e4dac816ae866999115500c818406b (patch) | |
tree | 7c727464a91aa1b94c3f18e2942546f352518342 /arch/arm/mach-mx3/mx31moboard.c | |
parent | cb88214d726b337d49c1f65cbc5e5ac85837b11b (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/mx31moboard.c')
-rw-r--r-- | arch/arm/mach-mx3/mx31moboard.c | 28 |
1 files changed, 1 insertions, 27 deletions
diff --git a/arch/arm/mach-mx3/mx31moboard.c b/arch/arm/mach-mx3/mx31moboard.c index b30460a2a559..34c2a1b99d4f 100644 --- a/arch/arm/mach-mx3/mx31moboard.c +++ b/arch/arm/mach-mx3/mx31moboard.c | |||
@@ -103,32 +103,6 @@ static void __init mxc_board_init(void) | |||
103 | } | 103 | } |
104 | } | 104 | } |
105 | 105 | ||
106 | /* | ||
107 | * This structure defines static mappings for the mx31moboard. | ||
108 | */ | ||
109 | static struct map_desc mx31moboard_io_desc[] __initdata = { | ||
110 | { | ||
111 | .virtual = AIPS1_BASE_ADDR_VIRT, | ||
112 | .pfn = __phys_to_pfn(AIPS1_BASE_ADDR), | ||
113 | .length = AIPS1_SIZE, | ||
114 | .type = MT_DEVICE_NONSHARED | ||
115 | }, { | ||
116 | .virtual = AIPS2_BASE_ADDR_VIRT, | ||
117 | .pfn = __phys_to_pfn(AIPS2_BASE_ADDR), | ||
118 | .length = AIPS2_SIZE, | ||
119 | .type = MT_DEVICE_NONSHARED | ||
120 | }, | ||
121 | }; | ||
122 | |||
123 | /* | ||
124 | * Set up static virtual mappings. | ||
125 | */ | ||
126 | void __init mx31moboard_map_io(void) | ||
127 | { | ||
128 | mxc_map_io(); | ||
129 | iotable_init(mx31moboard_io_desc, ARRAY_SIZE(mx31moboard_io_desc)); | ||
130 | } | ||
131 | |||
132 | static void __init mx31moboard_timer_init(void) | 106 | static void __init mx31moboard_timer_init(void) |
133 | { | 107 | { |
134 | mx31_clocks_init(26000000); | 108 | mx31_clocks_init(26000000); |
@@ -143,7 +117,7 @@ MACHINE_START(MX31MOBOARD, "EPFL Mobots mx31moboard") | |||
143 | .phys_io = AIPS1_BASE_ADDR, | 117 | .phys_io = AIPS1_BASE_ADDR, |
144 | .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, | 118 | .io_pg_offst = ((AIPS1_BASE_ADDR_VIRT) >> 18) & 0xfffc, |
145 | .boot_params = PHYS_OFFSET + 0x100, | 119 | .boot_params = PHYS_OFFSET + 0x100, |
146 | .map_io = mx31moboard_map_io, | 120 | .map_io = mxc_map_io, |
147 | .init_irq = mxc_init_irq, | 121 | .init_irq = mxc_init_irq, |
148 | .init_machine = mxc_board_init, | 122 | .init_machine = mxc_board_init, |
149 | .timer = &mx31moboard_timer, | 123 | .timer = &mx31moboard_timer, |