---

yaml --- r: 168762 b: refs/heads/master c: e54d551 h: refs/heads/master v: v3
git-mirror · Nov 17, 2009 · 94c6529 · 94c6529
1 parent db43620
commit 94c6529
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 2 deletions.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: f99b4a02848afe7fae960884dfa6e7a88f545f09
+refs/heads/master: e54d5512b600aa0d492010436ff7eb0c9194efc1
diff --git a/trunk/drivers/net/sungem.c b/trunk/drivers/net/sungem.c
@@ -2062,7 +2062,15 @@ static int gem_check_invariants(struct gem *gp)
 		mif_cfg &= ~MIF_CFG_PSELECT;
 		writel(mif_cfg, gp->regs + MIF_CFG);
 	} else {
-		gp->phy_type = phy_serialink;
+#ifdef CONFIG_SPARC
+		const char *p;
+
+		p = of_get_property(gp->of_node, "shared-pins", NULL);
+		if (p && !strcmp(p, "serdes"))
+			gp->phy_type = phy_serdes;
+		else
+#endif
+			gp->phy_type = phy_serialink;
 	}
 	if (gp->phy_type == phy_mii_mdio1 ||
 	    gp->phy_type == phy_mii_mdio0) {