aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2008-08-26 06:56:56 -0400
committerLennert Buytenhek <buytenh@marvell.com>2008-09-05 00:33:58 -0400
commitfc0eb9f226d8ecc8e3b563bf808bd6d61a6153a1 (patch)
tree29c9662ea3ba647bfbf3b0220c86dd168d575bff /arch/arm/mach-mv78xx0
parentf7981c1c67b53abb4a7d8a501e68585b9826179a (diff)
mv643xx_eth: smi sharing is a per-unit property, not a per-port one
Which top-level unit's SMI interface to use should be a property of the top-level unit, not of the individual ports. This patch moves the ->shared_smi pointer from the per-port platform data to the global platform data. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r--arch/arm/mach-mv78xx0/common.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 953a26c469cb..5842d3bb02b2 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -330,6 +330,7 @@ void __init mv78xx0_ge00_init(struct mv643xx_eth_platform_data *eth_data)
330struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = { 330struct mv643xx_eth_shared_platform_data mv78xx0_ge01_shared_data = {
331 .t_clk = 0, 331 .t_clk = 0,
332 .dram = &mv78xx0_mbus_dram_info, 332 .dram = &mv78xx0_mbus_dram_info,
333 .shared_smi = &mv78xx0_ge00_shared,
333}; 334};
334 335
335static struct resource mv78xx0_ge01_shared_resources[] = { 336static struct resource mv78xx0_ge01_shared_resources[] = {
@@ -370,7 +371,6 @@ static struct platform_device mv78xx0_ge01 = {
370void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data) 371void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
371{ 372{
372 eth_data->shared = &mv78xx0_ge01_shared; 373 eth_data->shared = &mv78xx0_ge01_shared;
373 eth_data->shared_smi = &mv78xx0_ge00_shared;
374 mv78xx0_ge01.dev.platform_data = eth_data; 374 mv78xx0_ge01.dev.platform_data = eth_data;
375 375
376 platform_device_register(&mv78xx0_ge01_shared); 376 platform_device_register(&mv78xx0_ge01_shared);
@@ -384,6 +384,7 @@ void __init mv78xx0_ge01_init(struct mv643xx_eth_platform_data *eth_data)
384struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = { 384struct mv643xx_eth_shared_platform_data mv78xx0_ge10_shared_data = {
385 .t_clk = 0, 385 .t_clk = 0,
386 .dram = &mv78xx0_mbus_dram_info, 386 .dram = &mv78xx0_mbus_dram_info,
387 .shared_smi = &mv78xx0_ge00_shared,
387}; 388};
388 389
389static struct resource mv78xx0_ge10_shared_resources[] = { 390static struct resource mv78xx0_ge10_shared_resources[] = {
@@ -424,7 +425,6 @@ static struct platform_device mv78xx0_ge10 = {
424void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data) 425void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
425{ 426{
426 eth_data->shared = &mv78xx0_ge10_shared; 427 eth_data->shared = &mv78xx0_ge10_shared;
427 eth_data->shared_smi = &mv78xx0_ge00_shared;
428 mv78xx0_ge10.dev.platform_data = eth_data; 428 mv78xx0_ge10.dev.platform_data = eth_data;
429 429
430 platform_device_register(&mv78xx0_ge10_shared); 430 platform_device_register(&mv78xx0_ge10_shared);
@@ -438,6 +438,7 @@ void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
438struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = { 438struct mv643xx_eth_shared_platform_data mv78xx0_ge11_shared_data = {
439 .t_clk = 0, 439 .t_clk = 0,
440 .dram = &mv78xx0_mbus_dram_info, 440 .dram = &mv78xx0_mbus_dram_info,
441 .shared_smi = &mv78xx0_ge00_shared,
441}; 442};
442 443
443static struct resource mv78xx0_ge11_shared_resources[] = { 444static struct resource mv78xx0_ge11_shared_resources[] = {
@@ -478,7 +479,6 @@ static struct platform_device mv78xx0_ge11 = {
478void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data) 479void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
479{ 480{
480 eth_data->shared = &mv78xx0_ge11_shared; 481 eth_data->shared = &mv78xx0_ge11_shared;
481 eth_data->shared_smi = &mv78xx0_ge00_shared;
482 mv78xx0_ge11.dev.platform_data = eth_data; 482 mv78xx0_ge11.dev.platform_data = eth_data;
483 483
484 platform_device_register(&mv78xx0_ge11_shared); 484 platform_device_register(&mv78xx0_ge11_shared);