diff options
| author | Scott Wood <scottwood@freescale.com> | 2013-12-14 02:43:39 (GMT) |
|---|---|---|
| committer | Scott Wood <scottwood@freescale.com> | 2013-12-14 02:45:02 (GMT) |
| commit | 5709059c4e110944712dc1f3d66a203a924c151a (patch) | |
| tree | 3f5ff4c45d2b1089c3f4504771a78e847b3ac073 /drivers/net/ethernet/freescale/xgmac_mdio.c | |
| parent | b7c81aa3ab2ac2c140e278b6d0e9a0b95112cf0b (diff) | |
| parent | 3dea020415467452d6ca2e907e21af07954741cf (diff) | |
| download | linux-fsl-qoriq-5709059c4e110944712dc1f3d66a203a924c151a.tar.xz | |
Merge remote-tracking branch 'origin/master' into merge
Conflicts:
arch/powerpc/boot/dts/b4qds.dts
drivers/crypto/caam/Makefile
Diffstat (limited to 'drivers/net/ethernet/freescale/xgmac_mdio.c')
| -rw-r--r-- | drivers/net/ethernet/freescale/xgmac_mdio.c | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/drivers/net/ethernet/freescale/xgmac_mdio.c b/drivers/net/ethernet/freescale/xgmac_mdio.c index b555b5f..7e21e6c 100644 --- a/drivers/net/ethernet/freescale/xgmac_mdio.c +++ b/drivers/net/ethernet/freescale/xgmac_mdio.c @@ -181,6 +181,8 @@ static int xgmac_mdio_read(struct mii_bus *bus, int phy_id, int regnum) return ret; } + out_be32(®s->mdio_addr, regnum); + /* Initiate the read */ out_be32(®s->mdio_ctl, mdio_ctl | MDIO_CTL_READ); |