diff options
author | Andrew Lunn <andrew@lunn.ch> | 2011-12-07 15:48:08 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-12-13 18:46:56 -0500 |
commit | db33f4de9952af112b0d4f2436ce931ae632aba0 (patch) | |
tree | 90160523773cfe528541db614cc81bd279d4ed73 /arch/arm/mach-dove/common.c | |
parent | 63a9332b232bdab0df6ef18a9f39e8d58a82bda4 (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-dove/common.c')
-rw-r--r-- | arch/arm/mach-dove/common.c | 15 |
1 files changed, 5 insertions, 10 deletions
diff --git a/arch/arm/mach-dove/common.c b/arch/arm/mach-dove/common.c index 29c1881c8acb..29ff0d076f0a 100644 --- a/arch/arm/mach-dove/common.c +++ b/arch/arm/mach-dove/common.c | |||
@@ -14,7 +14,6 @@ | |||
14 | #include <linux/platform_device.h> | 14 | #include <linux/platform_device.h> |
15 | #include <linux/pci.h> | 15 | #include <linux/pci.h> |
16 | #include <linux/clk.h> | 16 | #include <linux/clk.h> |
17 | #include <linux/mbus.h> | ||
18 | #include <linux/ata_platform.h> | 17 | #include <linux/ata_platform.h> |
19 | #include <linux/gpio.h> | 18 | #include <linux/gpio.h> |
20 | #include <asm/page.h> | 19 | #include <asm/page.h> |
@@ -72,8 +71,7 @@ void __init dove_map_io(void) | |||
72 | ****************************************************************************/ | 71 | ****************************************************************************/ |
73 | void __init dove_ehci0_init(void) | 72 | void __init dove_ehci0_init(void) |
74 | { | 73 | { |
75 | orion_ehci_init(&orion_mbus_dram_info, | 74 | orion_ehci_init(DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0); |
76 | DOVE_USB0_PHYS_BASE, IRQ_DOVE_USB0); | ||
77 | } | 75 | } |
78 | 76 | ||
79 | /***************************************************************************** | 77 | /***************************************************************************** |
@@ -81,8 +79,7 @@ void __init dove_ehci0_init(void) | |||
81 | ****************************************************************************/ | 79 | ****************************************************************************/ |
82 | void __init dove_ehci1_init(void) | 80 | void __init dove_ehci1_init(void) |
83 | { | 81 | { |
84 | orion_ehci_1_init(&orion_mbus_dram_info, | 82 | orion_ehci_1_init(DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1); |
85 | DOVE_USB1_PHYS_BASE, IRQ_DOVE_USB1); | ||
86 | } | 83 | } |
87 | 84 | ||
88 | /***************************************************************************** | 85 | /***************************************************************************** |
@@ -90,7 +87,7 @@ void __init dove_ehci1_init(void) | |||
90 | ****************************************************************************/ | 87 | ****************************************************************************/ |
91 | void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data) | 88 | void __init dove_ge00_init(struct mv643xx_eth_platform_data *eth_data) |
92 | { | 89 | { |
93 | orion_ge00_init(eth_data, &orion_mbus_dram_info, | 90 | orion_ge00_init(eth_data, |
94 | DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, | 91 | DOVE_GE00_PHYS_BASE, IRQ_DOVE_GE00_SUM, |
95 | 0, get_tclk()); | 92 | 0, get_tclk()); |
96 | } | 93 | } |
@@ -108,8 +105,7 @@ void __init dove_rtc_init(void) | |||
108 | ****************************************************************************/ | 105 | ****************************************************************************/ |
109 | void __init dove_sata_init(struct mv_sata_platform_data *sata_data) | 106 | void __init dove_sata_init(struct mv_sata_platform_data *sata_data) |
110 | { | 107 | { |
111 | orion_sata_init(sata_data, &orion_mbus_dram_info, | 108 | orion_sata_init(sata_data, DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA); |
112 | DOVE_SATA_PHYS_BASE, IRQ_DOVE_SATA); | ||
113 | 109 | ||
114 | } | 110 | } |
115 | 111 | ||
@@ -199,8 +195,7 @@ struct sys_timer dove_timer = { | |||
199 | ****************************************************************************/ | 195 | ****************************************************************************/ |
200 | void __init dove_xor0_init(void) | 196 | void __init dove_xor0_init(void) |
201 | { | 197 | { |
202 | orion_xor0_init(&orion_mbus_dram_info, | 198 | orion_xor0_init(DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE, |
203 | DOVE_XOR0_PHYS_BASE, DOVE_XOR0_HIGH_PHYS_BASE, | ||
204 | IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01); | 199 | IRQ_DOVE_XOR_00, IRQ_DOVE_XOR_01); |
205 | } | 200 | } |
206 | 201 | ||