diff options
| author |   Xing Zheng <zhengxing@rock-chips.com> | 2016-01-08 09:35:00 +0800 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2016-01-10 22:21:31 -0500 |
| commit | c9bca2fe3ca6d6dac2a27eb8619955648369efed (patch) | |
| tree | ac3bda6a929df87dbfcbade5e7927810758489dd /drivers/net | |
| parent | Merge branch 'bnxt_en-zeropad-fw-and-reset' (diff) | |
| download | linux-dev-c9bca2fe3ca6d6dac2a27eb8619955648369efed.tar.xz linux-dev-c9bca2fe3ca6d6dac2a27eb8619955648369efed.zip | |
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.
Signed-off-by: Xing Zheng <zhengxing@rock-chips.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'drivers/net')
| -rw-r--r-- | drivers/net/ethernet/arc/emac_rockchip.c | 11 |
1 files changed, 7 insertions, 4 deletions
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: |