Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 78de53f0 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller
Browse files

net: pxa168_eth: use phy_init_hw for PHY reset 



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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 7cd14636

drivers/net/ethernet/marvell/pxa168_eth.c

+1 −19
Original line number Diff line number Diff line
@@ -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);
@@ -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);

	}
@@ -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);