diff options
Diffstat (limited to 'arch/arm/mach-dove/common.c')
-rw-r--r-- | arch/arm/mach-dove/common.c | 11 |
1 files changed, 6 insertions, 5 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index a9e0dae86a26..29c1881c8acb 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <linux/irq.h> | 30 | #include <linux/irq.h> |
31 | #include <plat/time.h> | 31 | #include <plat/time.h> |
32 | #include <plat/common.h> | 32 | #include <plat/common.h> |
33 | #include <plat/addr-map.h> | ||
33 | #include "common.h" | 34 | #include "common.h" |
34 | 35 | ||
35 | static int get_tclk(void); | 36 | static int get_tclk(void); |
@@ -71,7 +72,7 @@ void __init dove_map_io(void) | |||
71 | ****************************************************************************/ | 72 | ****************************************************************************/ |
72 | void __init dove_ehci0_init(void) | 73 | void __init dove_ehci0_init(void) |
73 | { | 74 | { |
74 | orion_ehci_init(&dove_mbus_dram_info, | 75 | orion_ehci_init(&orion_mbus_dram_info, |
75 | DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0); | 76 | DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0); |
76 | } | 77 | } |
77 | 78 | ||
@@ -80,7 +81,7 @@ void __init dove_ehci0_init(void) | |||
80 | ****************************************************************************/ | 81 | ****************************************************************************/ |
81 | void __init dove_ehci1_init(void) | 82 | void __init dove_ehci1_init(void) |
82 | { | 83 | { |
83 | orion_ehci_1_init(&dove_mbus_dram_info, | 84 | orion_ehci_1_init(&orion_mbus_dram_info, |
84 | DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1); | 85 | DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1); |
85 | } | 86 | } |
86 | 87 | ||
@@ -89,7 +90,7 @@ void __init dove_ehci1_init(void) | |||
89 | ****************************************************************************/ | 90 | ****************************************************************************/ |
90 | void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data) | 91 | void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data) |
91 | { | 92 | { |
92 | orion_ge00_init(eth_data, &dove_mbus_dram_info, | 93 | orion_ge00_init(eth_data, &orion_mbus_dram_info, |
93 | DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, | 94 | DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, |
94 | 0, get_tclk()); | 95 | 0, get_tclk()); |
95 | } | 96 | } |
@@ -107,7 +108,7 @@ void __init dove_rtc_init(void) | |||
107 | ****************************************************************************/ | 108 | ****************************************************************************/ |
108 | void __init dove_sata_init(struct mv_sata_platform_data *sata_data) | 109 | void __init dove_sata_init(struct mv_sata_platform_data *sata_data) |
109 | { | 110 | { |
110 | orion_sata_init(sata_data, &dove_mbus_dram_info, | 111 | orion_sata_init(sata_data, &orion_mbus_dram_info, |
111 | DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA); | 112 | DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA); |
112 | 113 | ||
113 | } | 114 | } |
@@ -198,7 +199,7 @@ struct sys_timer dove_timer = { | |||
198 | ****************************************************************************/ | 199 | ****************************************************************************/ |
199 | void __init dove_xor0_init(void) | 200 | void __init dove_xor0_init(void) |
200 | { | 201 | { |
201 | orion_xor0_init(&dove_mbus_dram_info, | 202 | orion_xor0_init(&orion_mbus_dram_info, |
202 | DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE, | 203 | DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE, |
203 | IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01); | 204 | IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01); |
204 | } | 205 | } |