Thread (5 messages) 5 messages, 3 authors, 2009-03-24

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

From: Sascha Hauer <s.hauer@pengutronix.de>
Date: 2009-03-24 07:51:32

Hi Richard,

On Tue, Mar 24, 2009 at 02:47:25PM +0800, Richard Zhao wrote:
mx31pdk board don't have external PHY, but it wrongly pull up MDIO.
So, add flag SMSC911X_USE_INTERPHY to force using internal PHY.
This patch is outdated. Linux-next already contains a
SMSC911X_FORCE_INTERNAL_PHY for exactly this reason.

Sascha
quoted hunk ↗ jump to hunk
Signed-off-by: Richard Zhao <redacted>
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
-- 
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 |
Keyboard shortcuts
hback out one level
jnext message in thread
kprevious message in thread
ldrill in
Escclose help / fold thread tree
?toggle this help