Re: [PATCH 3/3] smsc911x: add flag SMSC911X_USE_INTERPHY

Previous thread: [PATCH 2/3] ARM: mxc: add mx31pdk Lan9217 support by Richard Zhao on Monday, March 23, 2009 - 11:44 pm. (3 messages)

Next thread: [PATCH] net: Add support for the OpenCores 10/100 Mbps Ethernet MAC. by Thierry Reding on Tuesday, March 24, 2009 - 3:18 am. (17 messages)
From: Richard Zhao
Date: Monday, March 23, 2009 - 11:47 pm

mx31pdk board don't have external PHY, but it wrongly pull up MDIO.
So, add flag SMSC911X_USE_INTERPHY to force using internal PHY.

Signed-off-by: Richard Zhao <linuxzsc@gmail.com>

diff --git a/drivers/net/smsc911x.c b/drivers/net/smsc911x.c
index d1590ac..60f7b74 100644
--- a/drivers/net/smsc911x.c
+++ b/drivers/net/smsc911x.c
@@ -831,10 +831,12 @@ static int __devinit smsc911x_mii_init(struct
platform_device *pdev,
 	case 0x01150000:
 	case 0x117A0000:
 	case 0x115A0000:
-		/* External PHY supported, try to autodetect */
-		if (smsc911x_phy_initialise_external(pdata) < 0) {
-			SMSC_TRACE(HW, "No external PHY detected, "
-				"using internal PHY");
+		if (!(pdata->config & SMSC911X_USE_INTERPHY)) {
+			/* External PHY supported, try to autodetect */
+			if (smsc911x_phy_initialise_external(pdata) < 0) {
+				SMSC_TRACE(HW, "No external PHY detected, "
+					"using internal PHY");
+			}
 		}
 		break;
 	default:
diff --git a/include/linux/smsc911x.h b/include/linux/smsc911x.h
index 1cbf031..42b088d 100644
--- a/include/linux/smsc911x.h
+++ b/include/linux/smsc911x.h
@@ -43,5 +43,6 @@ struct smsc911x_platform_config {
 /* Constants for flags */
 #define SMSC911X_USE_16BIT 			(BIT(0))
 #define SMSC911X_USE_32BIT 			(BIT(1))
+#define SMSC911X_USE_INTERPHY 			(BIT(2))

 #endif /* __LINUX_SMSC911X_H__ */
-- 
1.5.6.3
--

From: Sascha Hauer
Date: Tuesday, March 24, 2009 - 12:51 am

Hi Richard,


This patch is outdated. Linux-next already contains a
SMSC911X_FORCE_INTERNAL_PHY for exactly this reason.


-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
--

From: Richard Zhao
Date: Tuesday, March 24, 2009 - 1:36 am

Hi Sascha,

Sorry I didn't check linux-next. Do I need always to create mxc
patches based on linux-nex?
And I don't know why the smsc911x patch commited on Feb 1 on
linux-next still not be merged to mainline?

Thanks
Richard
--

From: Sascha Hauer
Date: Tuesday, March 24, 2009 - 1:52 am

Have a look at Documentation/development-process in the Kernel sources.

Sascha

-- 
Pengutronix e.K.                           |                             |
Industrial Linux Solutions                 | http://www.pengutronix.de/  |
Peiner Str. 6-8, 31137 Hildesheim, Germany | Phone: +49-5121-206917-0    |
Amtsgericht Hildesheim, HRA 2686           | Fax:   +49-5121-206917-5555 |
--

From: David Miller
Date: Tuesday, March 24, 2009 - 2:18 am

From: Richard Zhao <linuxzsc@gmail.com>

Because it was not a critical regression fix, so it goes
to net-next-2.6 until the merge window opens up.
--

Previous thread: [PATCH 2/3] ARM: mxc: add mx31pdk Lan9217 support by Richard Zhao on Monday, March 23, 2009 - 11:44 pm. (3 messages)

Next thread: [PATCH] net: Add support for the OpenCores 10/100 Mbps Ethernet MAC. by Thierry Reding on Tuesday, March 24, 2009 - 3:18 am. (17 messages)