aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-orion5x/common.c
diff options
context:
space:
mode:
Diffstat (limited to 'arch/arm/mach-orion5x/common.c')
-rw-r--r--arch/arm/mach-orion5x/common.c15
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-orion5x/common.c b/arch/arm/mach-orion5x/common.c
index acac255f9a1b..79ef693d2c03 100644
--- a/arch/arm/mach-orion5x/common.c
+++ b/arch/arm/mach-orion5x/common.c
@@ -15,7 +15,6 @@
15#include <linux/platform_device.h> 15#include <linux/platform_device.h>
16#include <linux/dma-mapping.h> 16#include <linux/dma-mapping.h>
17#include <linux/serial_8250.h> 17#include <linux/serial_8250.h>
18#include <linux/mbus.h>
19#include <linux/mv643xx_i2c.h> 18#include <linux/mv643xx_i2c.h>
20#include <linux/ata_platform.h> 19#include <linux/ata_platform.h>
21#include <net/dsa.h> 20#include <net/dsa.h>
@@ -72,8 +71,7 @@ void __init orion5x_map_io(void)
72 ****************************************************************************/ 71 ****************************************************************************/
73void __init orion5x_ehci0_init(void) 72void __init orion5x_ehci0_init(void)
74{ 73{
75 orion_ehci_init(&orion_mbus_dram_info, 74 orion_ehci_init(ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);
76 ORION5X_USB0_PHYS_BASE, IRQ_ORION5X_USB0_CTRL);
77} 75}
78 76
79 77
@@ -82,8 +80,7 @@ void __init orion5x_ehci0_init(void)
82 ****************************************************************************/ 80 ****************************************************************************/
83void __init orion5x_ehci1_init(void) 81void __init orion5x_ehci1_init(void)
84{ 82{
85 orion_ehci_1_init(&orion_mbus_dram_info, 83 orion_ehci_1_init(ORION5X_USB1_PHYS_BASE, IRQ_ORION5X_USB1_CTRL);
86 ORION5X_USB1_PHYS_BASE, IRQ_ORION5X_USB1_CTRL);
87} 84}
88 85
89 86
@@ -92,7 +89,7 @@ void __init orion5x_ehci1_init(void)
92 ****************************************************************************/ 89 ****************************************************************************/
93void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data) 90void __init orion5x_eth_init(struct mv643xx_eth_platform_data *eth_data)
94{ 91{
95 orion_ge00_init(eth_data, &orion_mbus_dram_info, 92 orion_ge00_init(eth_data,
96 ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM, 93 ORION5X_ETH_PHYS_BASE, IRQ_ORION5X_ETH_SUM,
97 IRQ_ORION5X_ETH_ERR, orion5x_tclk); 94 IRQ_ORION5X_ETH_ERR, orion5x_tclk);
98} 95}
@@ -122,8 +119,7 @@ void __init orion5x_i2c_init(void)
122 ****************************************************************************/ 119 ****************************************************************************/
123void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data) 120void __init orion5x_sata_init(struct mv_sata_platform_data *sata_data)
124{ 121{
125 orion_sata_init(sata_data, &orion_mbus_dram_info, 122 orion_sata_init(sata_data, ORION5X_SATA_PHYS_BASE, IRQ_ORION5X_SATA);
126 ORION5X_SATA_PHYS_BASE, IRQ_ORION5X_SATA);
127} 123}
128 124
129 125
@@ -159,8 +155,7 @@ void __init orion5x_uart1_init(void)
159 ****************************************************************************/ 155 ****************************************************************************/
160void __init orion5x_xor_init(void) 156void __init orion5x_xor_init(void)
161{ 157{
162 orion_xor0_init(&orion_mbus_dram_info, 158 orion_xor0_init(ORION5X_XOR_PHYS_BASE,
163 ORION5X_XOR_PHYS_BASE,
164 ORION5X_XOR_PHYS_BASE + 0x200, 159 ORION5X_XOR_PHYS_BASE + 0x200,
165 IRQ_ORION5X_XOR0, IRQ_ORION5X_XOR1); 160 IRQ_ORION5X_XOR0, IRQ_ORION5X_XOR1);
166} 161}