From: Xing Zheng Date: Fri, 8 Jan 2016 01:35:00 +0000 (+0800) Subject: UPSTREAM: net: ethernet: arc: Probe emac after set RMII clock X-Git-Tag: firefly_0821_release~2571 X-Git-Url: http://demsky.eecs.uci.edu/git/?a=commitdiff_plain;h=b4e2e700d90e1847b258129dd15865916f97bbc0;p=firefly-linux-kernel-4.4.55.git UPSTREAM: net: ethernet: arc: Probe emac after set RMII clock After enter arc_emac_probe, emac will get_phy_id, phy_poll_reset and other connecting PHY via mdiobus_read, so we need to set correct ref clock rate for emac before probe emac. Change-Id: Iffaa7a60efcfcadded803df7c0b20e5a2422d646 Signed-off-by: Xing Zheng Signed-off-by: David S. Miller Signed-off-by: Caesar Wang (cherry picked from commit c9bca2fe3ca6d6dac2a27eb8619955648369efed) --- diff --git a/drivers/net/ethernet/arc/emac_rockchip.c b/drivers/net/ethernet/arc/emac_rockchip.c index c31c7407b753..36e9eb1ee44c 100644 --- a/drivers/net/ethernet/arc/emac_rockchip.c +++ b/drivers/net/ethernet/arc/emac_rockchip.c @@ -164,10 +164,6 @@ static int emac_rockchip_probe(struct platform_device *pdev) } } - err = arc_emac_probe(ndev, interface); - if (err) - goto out_regulator_disable; - /* write-enable bits */ data = GRF_MODE_ENABLE_BIT | GRF_SPEED_ENABLE_BIT; @@ -184,6 +180,13 @@ static int emac_rockchip_probe(struct platform_device *pdev) err = clk_set_rate(priv->refclk, 50000000); if (err) dev_err(dev, "failed to change reference clock rate (%d)\n", err); + + err = arc_emac_probe(ndev, interface); + if (err) { + dev_err(dev, "failed to probe arc emac (%d)\n", err); + goto out_regulator_disable; + } + return 0; out_regulator_disable: