diff options
| author | David S. Miller <davem@davemloft.net> | 2009-11-17 04:46:18 -0800 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2009-11-17 04:46:18 -0800 |
| commit | e54d5512b600aa0d492010436ff7eb0c9194efc1 (patch) | |
| tree | 3d6c07a91d5e97d0152a56b3e5e2cb53b06b3843 /drivers | |
| parent | f99b4a02848afe7fae960884dfa6e7a88f545f09 (diff) | |
| download | linux-stable-e54d5512b600aa0d492010436ff7eb0c9194efc1.tar.gz linux-stable-e54d5512b600aa0d492010436ff7eb0c9194efc1.tar.bz2 linux-stable-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 'drivers')
| -rw-r--r-- | drivers/net/sungem.c | 10 |
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) { |