Skip to content

Commit

Permalink
net: pxa168_eth: use phy_init_hw for PHY reset
Browse files Browse the repository at this point in the history
Instead of open-coding a PHY reset through the MII BMCR register, use
phy_init_hw() which does this for us and ensures that PHY device fixups
are also applied. We also remove a call to ethernet_phy_reset() which is
now unncessary since phy_attach() calls phy_attach_direct() which in
turns calls phy_init_hw().

Signed-off-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
  • Loading branch information
Florian Fainelli authored and David S. Miller committed Dec 10, 2013
1 parent 7cd1463 commit 78de53f
Showing 1 changed file with 1 addition and 19 deletions.
20 changes: 1 addition & 19 deletions drivers/net/ethernet/marvell/pxa168_eth.c
Original file line number Diff line number Diff line change
Expand Up @@ -320,23 +320,6 @@ static void ethernet_phy_set_addr(struct pxa168_eth_private *pep, int phy_addr)
wrl(pep, PHY_ADDRESS, reg_data);
}

static void ethernet_phy_reset(struct pxa168_eth_private *pep)
{
int data;

data = phy_read(pep->phy, MII_BMCR);
if (data < 0)
return;

data |= BMCR_RESET;
if (phy_write(pep->phy, MII_BMCR, data) < 0)
return;

do {
data = phy_read(pep->phy, MII_BMCR);
} while (data >= 0 && data & BMCR_RESET);
}

static void rxq_refill(struct net_device *dev)
{
struct pxa168_eth_private *pep = netdev_priv(dev);
Expand Down Expand Up @@ -645,7 +628,7 @@ static void eth_port_start(struct net_device *dev)
struct ethtool_cmd cmd;

pxa168_get_settings(pep->dev, &cmd);
ethernet_phy_reset(pep);
phy_init_hw(pep->phy);
pxa168_set_settings(pep->dev, &cmd);
}

Expand Down Expand Up @@ -1382,7 +1365,6 @@ static struct phy_device *phy_scan(struct pxa168_eth_private *pep, int phy_addr)
static void phy_init(struct pxa168_eth_private *pep, int speed, int duplex)
{
struct phy_device *phy = pep->phy;
ethernet_phy_reset(pep);

phy_attach(pep->dev, dev_name(&phy->dev), PHY_INTERFACE_MODE_MII);

Expand Down

0 comments on commit 78de53f

Please sign in to comment.