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

Commit 1cce16d3 authored by Jason Gunthorpe's avatar Jason Gunthorpe Committed by David S. Miller
Browse files

net: mv643xx_eth: Add missing phy_addr_set in DT mode 



Commit cc9d4598 'net: mv643xx_eth: use of_phy_connect if phy_node
present' made the call to phy_scan optional, if the DT has a link to
the phy node.

However phy_scan has the side effect of calling phy_addr_set, which
writes the phy MDIO address to the ethernet controller. If phy_addr_set
is not called, and the bootloader has not set the correct address then
the driver will fail to function.

Tested on Kirkwood.

Signed-off-by: default avatarJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: default avatarSebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: default avatarArnaud Ebalard <arno@natisbad.org>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 482fc609

drivers/net/ethernet/marvell/mv643xx_eth.c

+1 −0
Original line number Diff line number Diff line
@@ -2890,6 +2890,7 @@ static int mv643xx_eth_probe(struct platform_device *pdev) 
					 PHY_INTERFACE_MODE_GMII);

		if (!mp->phy)

			err = -ENODEV;

		phy_addr_set(mp, mp->phy->addr);

	} else if (pd->phy_addr != MV643XX_ETH_PHY_NONE) {

		mp->phy = phy_scan(mp, pd->phy_addr);