aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0
diff options
context:
space:
mode:
authorAndrew Lunn <andrew@lunn.ch>2011-12-07 15:48:08 -0500
committerNicolas Pitre <nico@fluxnic.net>2011-12-13 18:46:56 -0500
commitdb33f4de9952af112b0d4f2436ce931ae632aba0 (patch)
tree90160523773cfe528541db614cc81bd279d4ed73 /arch/arm/mach-mv78xx0
parent63a9332b232bdab0df6ef18a9f39e8d58a82bda4 (diff)
ARM: Orion: Remove address map info from all platform data structures
Signed-off-by: Andrew Lunn <andrew@lunn.ch> Tested-by: Michael Walle <michael@walle.cc> Acked-by: Nicolas Pitre <nico@linaro.org> Signed-off-by: Nicolas Pitre <nico@fluxnic.net>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r--arch/arm/mach-mv78xx0/common.c21
1 files changed, 8 insertions, 13 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index be0c232ea0d..534ce204e8b 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -12,7 +12,6 @@
12#include <linux/init.h> 12#include <linux/init.h>
13#include <linux/platform_device.h> 13#include <linux/platform_device.h>
14#include <linux/serial_8250.h> 14#include <linux/serial_8250.h>
15#include <linux/mbus.h>
16#include <linux/ata_platform.h> 15#include <linux/ata_platform.h>
17#include <linux/ethtool.h> 16#include <linux/ethtool.h>
18#include <asm/mach/map.h> 17#include <asm/mach/map.h>
@@ -170,8 +169,7 @@ void __init mv78xx0_map_io(void)
170 ****************************************************************************/ 169 ****************************************************************************/
171void __init mv78xx0_ehci0_init(void) 170void __init mv78xx0_ehci0_init(void)
172{ 171{
173 orion_ehci_init(&orion_mbus_dram_info, 172 orion_ehci_init(USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);
174 USB0_PHYS_BASE, IRQ_MV78XX0_USB_0);
175} 173}
176 174
177 175
@@ -180,8 +178,7 @@ void __init mv78xx0_ehci0_init(void)
180 ****************************************************************************/ 178 ****************************************************************************/
181void __init mv78xx0_ehci1_init(void) 179void __init mv78xx0_ehci1_init(void)
182{ 180{
183 orion_ehci_1_init(&orion_mbus_dram_info, 181 orion_ehci_1_init(USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);
184 USB1_PHYS_BASE, IRQ_MV78XX0_USB_1);
185} 182}
186 183
187 184
@@ -190,8 +187,7 @@ void __init mv78xx0_ehci1_init(void)
190 ****************************************************************************/ 187 ****************************************************************************/
191void __init mv78xx0_ehci2_init(void) 188void __init mv78xx0_ehci2_init(void)
192{ 189{
193 orion_ehci_2_init(&orion_mbus_dram_info, 190 orion_ehci_2_init(USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);
194 USB2_PHYS_BASE, IRQ_MV78XX0_USB_2);
195} 191}
196 192
197 193
@@ -200,7 +196,7 @@ void __init mv78xx0_ehci2_init(void)
200 ****************************************************************************/ 196 ****************************************************************************/
201void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data) 197void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
202{ 198{
203 orion_ge00_init(eth_data, &orion_mbus_dram_info, 199 orion_ge00_init(eth_data,
204 GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM, 200 GE00_PHYS_BASE, IRQ_MV78XX0_GE00_SUM,
205 IRQ_MV78XX0_GE_ERR, get_tclk()); 201 IRQ_MV78XX0_GE_ERR, get_tclk());
206} 202}
@@ -211,7 +207,7 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
211 ****************************************************************************/ 207 ****************************************************************************/
212void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) 208void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
213{ 209{
214 orion_ge01_init(eth_data, &orion_mbus_dram_info, 210 orion_ge01_init(eth_data,
215 GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM, 211 GE01_PHYS_BASE, IRQ_MV78XX0_GE01_SUM,
216 NO_IRQ, get_tclk()); 212 NO_IRQ, get_tclk());
217} 213}
@@ -235,7 +231,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
235 eth_data->duplex = DUPLEX_FULL; 231 eth_data->duplex = DUPLEX_FULL;
236 } 232 }
237 233
238 orion_ge10_init(eth_data, &orion_mbus_dram_info, 234 orion_ge10_init(eth_data,
239 GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM, 235 GE10_PHYS_BASE, IRQ_MV78XX0_GE10_SUM,
240 NO_IRQ, get_tclk()); 236 NO_IRQ, get_tclk());
241} 237}
@@ -259,7 +255,7 @@ void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
259 eth_data->duplex = DUPLEX_FULL; 255 eth_data->duplex = DUPLEX_FULL;
260 } 256 }
261 257
262 orion_ge11_init(eth_data, &orion_mbus_dram_info, 258 orion_ge11_init(eth_data,
263 GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM, 259 GE11_PHYS_BASE, IRQ_MV78XX0_GE11_SUM,
264 NO_IRQ, get_tclk()); 260 NO_IRQ, get_tclk());
265} 261}
@@ -278,8 +274,7 @@ void __init mv78xx0_i2c_init(void)
278 ****************************************************************************/ 274 ****************************************************************************/
279void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data) 275void __init mv78xx0_sata_init(struct mv_sata_platform_data *sata_data)
280{ 276{
281 orion_sata_init(sata_data, &orion_mbus_dram_info, 277 orion_sata_init(sata_data, SATA_PHYS_BASE, IRQ_MV78XX0_SATA);
282 SATA_PHYS_BASE, IRQ_MV78XX0_SATA);
283} 278}
284 279
285 280