From 5e7ff9b66013e59aa4f4515805e7508e3e7280d6 Mon Sep 17 00:00:00 2001
From: Sonic Zhang <sonic.zhang@analog.com>
Date: Tue, 23 Nov 2010 10:00:15 +0000
Subject: [PATCH] --- yaml --- r: 228459 b: refs/heads/master c:
 d57bc0feaa958bc8a6a0b9d3a29f78c699e50d2a h: refs/heads/master i:   228457:
 2da90514f95759fe47a63073c1b16ac1391c5c63   228455:
 27aff2dea35fdfc9ac62c717659ea39e5058bd23 v: v3

---
 [refs]                                        |  2 +-
 trunk/arch/blackfin/mach-bf518/boards/ezbrd.c | 17 ++++++++---------
 2 files changed, 9 insertions(+), 10 deletions(-)

diff --git a/[refs] b/[refs]
index fd8dca3b2723..7617174b71b3 100644
--- a/[refs]
+++ b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 874f6cfd3a05d5452064531078cae9b19a5e790c
+refs/heads/master: d57bc0feaa958bc8a6a0b9d3a29f78c699e50d2a
diff --git a/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c b/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
index 0c75aa35faf4..8d55a8dad7ab 100644
--- a/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
+++ b/trunk/arch/blackfin/mach-bf518/boards/ezbrd.c
@@ -104,24 +104,23 @@ static const unsigned short bfin_mac_peripherals[] = {
 
 static struct bfin_phydev_platform_data bfin_phydev_data[] = {
 	{
-		.addr = 1,
-		.irq = IRQ_MAC_PHYINT,
-	},
-	{
-		.addr = 2,
-		.irq = IRQ_MAC_PHYINT,
-	},
-	{
+#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
 		.addr = 3,
+#else
+		.addr = 1,
+#endif
 		.irq = IRQ_MAC_PHYINT,
 	},
 };
 
 static struct bfin_mii_bus_platform_data bfin_mii_bus_data = {
-	.phydev_number = 3,
+	.phydev_number = 1,
 	.phydev_data = bfin_phydev_data,
 	.phy_mode = PHY_INTERFACE_MODE_MII,
 	.mac_peripherals = bfin_mac_peripherals,
+#if defined(CONFIG_NET_DSA_KSZ8893M) || defined(CONFIG_NET_DSA_KSZ8893M_MODULE)
+	.phy_mask = 0xfff7, /* Only probe the port phy connect to the on chip MAC */
+#endif
 };
 
 static struct platform_device bfin_mii_bus = {