summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorDavid S. Miller <davem@davemloft.net>2009-11-17 13:46:18 +0100
committerDavid S. Miller <davem@davemloft.net>2009-11-17 13:46:18 +0100
commite54d5512b600aa0d492010436ff7eb0c9194efc1 (patch)
tree3d6c07a91d5e97d0152a56b3e5e2cb53b06b3843
parentnet: fix mdio section mismatch warning (diff)
downloadlinux-e54d5512b600aa0d492010436ff7eb0c9194efc1.tar.xz
linux-e54d5512b600aa0d492010436ff7eb0c9194efc1.zip
sungem: Fix Serdes detection.
We need to look for the 'shared-pins' property to get this right. Based upon a patch by Hermann Lauer. Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
-rw-r--r--drivers/net/sungem.c10
1 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/sungem.c b/drivers/net/sungem.c
index 305ec3d783db..1927b3de9eec 100644
--- a/drivers/net/sungem.c
+++ b/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) {