aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorGabor Juhos <juhosg@openwrt.org>2012-03-07 16:32:43 +0000
committerGabor Juhos <juhosg@openwrt.org>2012-03-07 16:32:43 +0000
commit6bf74d0a6cba08127ba8f4616527d42618527a31 (patch)
tree4961bda94f56d9f39def208f9ebcb92a0a5c5db9
parenta5c699969d206bdcc65852c8c6bcab523e402a56 (diff)
downloadupstream-6bf74d0a6cba08127ba8f4616527d42618527a31.tar.gz
upstream-6bf74d0a6cba08127ba8f4616527d42618527a31.tar.bz2
upstream-6bf74d0a6cba08127ba8f4616527d42618527a31.zip
generic: ar8216: use ar8216_read_port_link to get the CPU port link parameters
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@30846 3c298f89-4303-0410-b956-a3cf2f4a3e73
-rw-r--r--target/linux/generic/files/drivers/net/phy/ar8216.c23
1 files changed, 20 insertions, 3 deletions
diff --git a/target/linux/generic/files/drivers/net/phy/ar8216.c b/target/linux/generic/files/drivers/net/phy/ar8216.c
index 38ccaa36a7..2e3a8426b0 100644
--- a/target/linux/generic/files/drivers/net/phy/ar8216.c
+++ b/target/linux/generic/files/drivers/net/phy/ar8216.c
@@ -929,14 +929,31 @@ static int
ar8216_read_status(struct phy_device *phydev)
{
struct ar8216_priv *priv = phydev->priv;
+ struct switch_port_link link;
int ret;
if (phydev->addr != 0) {
return genphy_read_status(phydev);
}
- phydev->speed = priv->chip == AR8316 ? SPEED_1000 : SPEED_100;
- phydev->duplex = DUPLEX_FULL;
- phydev->link = 1;
+ ar8216_read_port_link(priv, phydev->addr, &link);
+ phydev->link = !!link.link;
+ if (!phydev->link)
+ return 0;
+
+ switch (link.speed) {
+ case SWITCH_PORT_SPEED_10:
+ phydev->speed = SPEED_10;
+ break;
+ case SWITCH_PORT_SPEED_100:
+ phydev->speed = SPEED_100;
+ break;
+ case SWITCH_PORT_SPEED_1000:
+ phydev->speed = SPEED_1000;
+ break;
+ default:
+ phydev->speed = 0;
+ }
+ phydev->duplex = link.duplex ? DUPLEX_FULL : DUPLEX_HALF;
/* flush the address translation unit */
mutex_lock(&priv->reg_mutex);