]> git.kernelconcepts.de Git - karo-tx-linux.git/commitdiff
net: ethernet: arc: Probe emac after set RMII clock
authorXing Zheng <zhengxing@rock-chips.com>
Fri, 8 Jan 2016 01:35:00 +0000 (09:35 +0800)
committerDavid S. Miller <davem@davemloft.net>
Mon, 11 Jan 2016 03:21:31 +0000 (22:21 -0500)
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.

Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
drivers/net/ethernet/arc/emac_rockchip.c

index c31c7407b75353c1d2d4f855957b13098a65ab96..36e9eb1ee44c255de35c601e1f659549b667fc19 100644 (file)
@@ -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: