diff options
author | Andrew Lunn <andrew@lunn.ch> | 2011-12-07 15:48:06 -0500 |
---|---|---|
committer | Nicolas Pitre <nico@fluxnic.net> | 2011-12-13 18:46:55 -0500 |
commit | 45173d5ed4c9a397db31623bf6469efbd3a239cd (patch) | |
tree | d4efe8af8c7b23ed2a97d2686a88037ea6bc7758 /arch/arm/mach-kirkwood/common.c | |
parent | b6d1c33a31deb1784c1d34070db6e84fd6f9d870 (diff) |
ARM: Orion: mbus_dram_info consolidation
Move the *_mbus_dram_info structure into the orion platform and call it
orion_mbus_dram_info everywhere.
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-kirkwood/common.c')
-rw-r--r-- | arch/arm/mach-kirkwood/common.c | 15 |
1 files changed, 8 insertions, 7 deletions
diff --git a/arch/arm/mach-kirkwood/common.c b/arch/arm/mach-kirkwood/common.c index b9632ee57b0..dd63fac9ed0 100644 --- a/arch/arm/mach-kirkwood/common.c +++ b/arch/arm/mach-kirkwood/common.c | |||
@@ -30,6 +30,7 @@ | |||
30 | #include <plat/orion_nand.h> | 30 | #include <plat/orion_nand.h> |
31 | #include <plat/common.h> | 31 | #include <plat/common.h> |
32 | #include <plat/time.h> | 32 | #include <plat/time.h> |
33 | #include <plat/addr-map.h> | ||
33 | #include "common.h" | 34 | #include "common.h" |
34 | 35 | ||
35 | /***************************************************************************** | 36 | /***************************************************************************** |
@@ -73,7 +74,7 @@ unsigned int kirkwood_clk_ctrl = CGC_DUNIT | CGC_RESERVED; | |||
73 | void __init kirkwood_ehci_init(void) | 74 | void __init kirkwood_ehci_init(void) |
74 | { | 75 | { |
75 | kirkwood_clk_ctrl |= CGC_USB0; | 76 | kirkwood_clk_ctrl |= CGC_USB0; |
76 | orion_ehci_init(&kirkwood_mbus_dram_info, | 77 | orion_ehci_init(&orion_mbus_dram_info, |
77 | USB_PHYS_BASE, IRQ_KIRKWOOD_USB); | 78 | USB_PHYS_BASE, IRQ_KIRKWOOD_USB); |
78 | } | 79 | } |
79 | 80 | ||
@@ -85,7 +86,7 @@ void __init kirkwood_ge00_init(struct mv643xx_eth_platform_data *eth_data) | |||
85 | { | 86 | { |
86 | kirkwood_clk_ctrl |= CGC_GE0; | 87 | kirkwood_clk_ctrl |= CGC_GE0; |
87 | 88 | ||
88 | orion_ge00_init(eth_data, &kirkwood_mbus_dram_info, | 89 | orion_ge00_init(eth_data, &orion_mbus_dram_info, |
89 | GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM, | 90 | GE00_PHYS_BASE, IRQ_KIRKWOOD_GE00_SUM, |
90 | IRQ_KIRKWOOD_GE00_ERR, kirkwood_tclk); | 91 | IRQ_KIRKWOOD_GE00_ERR, kirkwood_tclk); |
91 | } | 92 | } |
@@ -99,7 +100,7 @@ void __init kirkwood_ge01_init(struct mv643xx_eth_platform_data *eth_data) | |||
99 | 100 | ||
100 | kirkwood_clk_ctrl |= CGC_GE1; | 101 | kirkwood_clk_ctrl |= CGC_GE1; |
101 | 102 | ||
102 | orion_ge01_init(eth_data, &kirkwood_mbus_dram_info, | 103 | orion_ge01_init(eth_data, &orion_mbus_dram_info, |
103 | GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM, | 104 | GE01_PHYS_BASE, IRQ_KIRKWOOD_GE01_SUM, |
104 | IRQ_KIRKWOOD_GE01_ERR, kirkwood_tclk); | 105 | IRQ_KIRKWOOD_GE01_ERR, kirkwood_tclk); |
105 | } | 106 | } |
@@ -178,7 +179,7 @@ void __init kirkwood_sata_init(struct mv_sata_platform_data *sata_data) | |||
178 | if (sata_data->n_ports > 1) | 179 | if (sata_data->n_ports > 1) |
179 | kirkwood_clk_ctrl |= CGC_SATA1; | 180 | kirkwood_clk_ctrl |= CGC_SATA1; |
180 | 181 | ||
181 | orion_sata_init(sata_data, &kirkwood_mbus_dram_info, | 182 | orion_sata_init(sata_data, &orion_mbus_dram_info, |
182 | SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA); | 183 | SATA_PHYS_BASE, IRQ_KIRKWOOD_SATA); |
183 | } | 184 | } |
184 | 185 | ||
@@ -221,7 +222,7 @@ void __init kirkwood_sdio_init(struct mvsdio_platform_data *mvsdio_data) | |||
221 | mvsdio_data->clock = 100000000; | 222 | mvsdio_data->clock = 100000000; |
222 | else | 223 | else |
223 | mvsdio_data->clock = 200000000; | 224 | mvsdio_data->clock = 200000000; |
224 | mvsdio_data->dram = &kirkwood_mbus_dram_info; | 225 | mvsdio_data->dram = &orion_mbus_dram_info; |
225 | kirkwood_clk_ctrl |= CGC_SDIO; | 226 | kirkwood_clk_ctrl |= CGC_SDIO; |
226 | kirkwood_sdio.dev.platform_data = mvsdio_data; | 227 | kirkwood_sdio.dev.platform_data = mvsdio_data; |
227 | platform_device_register(&kirkwood_sdio); | 228 | platform_device_register(&kirkwood_sdio); |
@@ -285,7 +286,7 @@ static void __init kirkwood_xor0_init(void) | |||
285 | { | 286 | { |
286 | kirkwood_clk_ctrl |= CGC_XOR0; | 287 | kirkwood_clk_ctrl |= CGC_XOR0; |
287 | 288 | ||
288 | orion_xor0_init(&kirkwood_mbus_dram_info, | 289 | orion_xor0_init(&orion_mbus_dram_info, |
289 | XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE, | 290 | XOR0_PHYS_BASE, XOR0_HIGH_PHYS_BASE, |
290 | IRQ_KIRKWOOD_XOR_00, IRQ_KIRKWOOD_XOR_01); | 291 | IRQ_KIRKWOOD_XOR_00, IRQ_KIRKWOOD_XOR_01); |
291 | } | 292 | } |
@@ -364,7 +365,7 @@ static struct resource kirkwood_i2s_resources[] = { | |||
364 | }; | 365 | }; |
365 | 366 | ||
366 | static struct kirkwood_asoc_platform_data kirkwood_i2s_data = { | 367 | static struct kirkwood_asoc_platform_data kirkwood_i2s_data = { |
367 | .dram = &kirkwood_mbus_dram_info, | 368 | .dram = &orion_mbus_dram_info, |
368 | .burst = 128, | 369 | .burst = 128, |
369 | }; | 370 | }; |
370 | 371 | ||