aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-mv78xx0
diff options
context:
space:
mode:
authorLennert Buytenhek <buytenh@wantstofly.org>2009-02-19 20:31:58 -0500
committerNicolas Pitre <nico@cam.org>2009-02-19 22:41:37 -0500
commit712424fd95134bf88d27f3885389fe6ab13f34ac (patch)
tree8b146e05b2f2810bddd1c55f30764a690a534a7f /arch/arm/mach-mv78xx0
parentcfdeb6376e439c58c2d37de492d2a8c763621022 (diff)
[ARM] mv78xx0: force eth2/eth3 to PHYless mode on pre-A0 silicon
On pre-A0 revisions of the mv78xx0 SoC, the third and fourth ethernet interface are not brought out to pins, but are internally cross-connected, so if we run on pre-A0 silicon, we'll force eth2 and eth3 to PHYless mode. Signed-off-by: Lennert Buytenhek <buytenh@marvell.com>
Diffstat (limited to 'arch/arm/mach-mv78xx0')
-rw-r--r--arch/arm/mach-mv78xx0/common.c27
1 files changed, 27 insertions, 0 deletions
diff --git a/arch/arm/mach-mv78xx0/common.c b/arch/arm/mach-mv78xx0/common.c
index 538f8f4d4f23..15f9913f4a90 100644
--- a/arch/arm/mach-mv78xx0/common.c
+++ b/arch/arm/mach-mv78xx0/common.c
@@ -15,6 +15,7 @@
15#include <linux/mbus.h> 15#include <linux/mbus.h>
16#include <linux/mv643xx_eth.h> 16#include <linux/mv643xx_eth.h>
17#include <linux/ata_platform.h> 17#include <linux/ata_platform.h>
18#include <linux/ethtool.h>
18#include <asm/mach/map.h> 19#include <asm/mach/map.h>
19#include <asm/mach/time.h> 20#include <asm/mach/time.h>
20#include <mach/mv78xx0.h> 21#include <mach/mv78xx0.h>
@@ -430,9 +431,22 @@ static struct platform_device mv78xx0_ge10 = {
430 431
431void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data) 432void __init mv78xx0_ge10_init(struct mv643xx_eth_platform_data *eth_data)
432{ 433{
434 u32 dev, rev;
435
433 eth_data->shared = &mv78xx0_ge10_shared; 436 eth_data->shared = &mv78xx0_ge10_shared;
434 mv78xx0_ge10.dev.platform_data = eth_data; 437 mv78xx0_ge10.dev.platform_data = eth_data;
435 438
439 /*
440 * On the Z0, ge10 and ge11 are internally connected back
441 * to back, and not brought out.
442 */
443 mv78xx0_pcie_id(&dev, &rev);
444 if (dev == MV78X00_Z0_DEV_ID) {
445 eth_data->phy_addr = MV643XX_ETH_PHY_NONE;
446 eth_data->speed = SPEED_1000;
447 eth_data->duplex = DUPLEX_FULL;
448 }
449
436 platform_device_register(&mv78xx0_ge10_shared); 450 platform_device_register(&mv78xx0_ge10_shared);
437 platform_device_register(&mv78xx0_ge10); 451 platform_device_register(&mv78xx0_ge10);
438} 452}
@@ -484,9 +498,22 @@ static struct platform_device mv78xx0_ge11 = {
484 498
485void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data) 499void __init mv78xx0_ge11_init(struct mv643xx_eth_platform_data *eth_data)
486{ 500{
501 u32 dev, rev;
502
487 eth_data->shared = &mv78xx0_ge11_shared; 503 eth_data->shared = &mv78xx0_ge11_shared;
488 mv78xx0_ge11.dev.platform_data = eth_data; 504 mv78xx0_ge11.dev.platform_data = eth_data;
489 505
506 /*
507 * On the Z0, ge10 and ge11 are internally connected back
508 * to back, and not brought out.
509 */
510 mv78xx0_pcie_id(&dev, &rev);
511 if (dev == MV78X00_Z0_DEV_ID) {
512 eth_data->phy_addr = MV643XX_ETH_PHY_NONE;
513 eth_data->speed = SPEED_1000;
514 eth_data->duplex = DUPLEX_FULL;
515 }
516
490 platform_device_register(&mv78xx0_ge11_shared); 517 platform_device_register(&mv78xx0_ge11_shared);
491 platform_device_register(&mv78xx0_ge11); 518 platform_device_register(&mv78xx0_ge11);
492} 519}