Commit e24cf6b3 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: dsa: b53: Don't assign autonegotiation enabled

PHYLINK takes care of filing the right information into
state->an_enabled, get rid of the read from the SerDes's BMCR register.

Fixes: 0e01491d ("net: dsa: b53: Add SerDes support")
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 5b9b0a80
...@@ -100,15 +100,13 @@ int b53_serdes_link_state(struct b53_device *dev, int port, ...@@ -100,15 +100,13 @@ int b53_serdes_link_state(struct b53_device *dev, int port,
struct phylink_link_state *state) struct phylink_link_state *state)
{ {
u8 lane = b53_serdes_map_lane(dev, port); u8 lane = b53_serdes_map_lane(dev, port);
u16 dig, bmcr, bmsr; u16 dig, bmsr;
if (lane == B53_INVALID_LANE) if (lane == B53_INVALID_LANE)
return 1; return 1;
dig = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_STATUS, dig = b53_serdes_read(dev, lane, B53_SERDES_DIGITAL_STATUS,
SERDES_DIGITAL_BLK); SERDES_DIGITAL_BLK);
bmcr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMCR),
SERDES_MII_BLK);
bmsr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMSR), bmsr = b53_serdes_read(dev, lane, B53_SERDES_MII_REG(MII_BMSR),
SERDES_MII_BLK); SERDES_MII_BLK);
...@@ -129,7 +127,6 @@ int b53_serdes_link_state(struct b53_device *dev, int port, ...@@ -129,7 +127,6 @@ int b53_serdes_link_state(struct b53_device *dev, int port,
} }
state->duplex = dig & DUPLEX_STATUS ? DUPLEX_FULL : DUPLEX_HALF; state->duplex = dig & DUPLEX_STATUS ? DUPLEX_FULL : DUPLEX_HALF;
state->an_enabled = !!(bmcr & BMCR_ANENABLE);
state->an_complete = !!(bmsr & BMSR_ANEGCOMPLETE); state->an_complete = !!(bmsr & BMSR_ANEGCOMPLETE);
state->link = !!(dig & LINK_STATUS); state->link = !!(dig & LINK_STATUS);
if (dig & PAUSE_RESOLUTION_RX_SIDE) if (dig & PAUSE_RESOLUTION_RX_SIDE)
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment