net: mv643xx_eth: Add missing phy_addr_set in DT mode
authorJason Gunthorpe <jgunthorpe@obsidianresearch.com>
Tue, 5 Nov 2013 00:27:19 +0000 (17:27 -0700)
committerDavid S. Miller <davem@davemloft.net>
Wed, 6 Nov 2013 03:07:03 +0000 (22:07 -0500)
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: Jason Gunthorpe <jgunthorpe@obsidianresearch.com>
Acked-by: Sebastian Hesselbarth <sebastian.hesselbarth@gmail.com>
Tested-by: Arnaud Ebalard <arno@natisbad.org>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/marvell/mv643xx_eth.c

index 4cfae6c9a63fb29f9bb8da02713b60835bb0f79c..00cd36e0860105aaa577d089e8a169e7d7b1fd97 100644 (file)
@@ -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);