Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 5799fc90 authored by Kweh, Hock Leong's avatar Kweh, Hock Leong Committed by David S. Miller
Browse files

net: stmmac: fix incorrect bit set in gmac4 mdio addr register 



Fixing the gmac4 mdio write access to use MII_GMAC4_WRITE only instead of
OR together with MII_WRITE.

Signed-off-by: default avatarKweh, Hock Leong <hock.leong.kweh@intel.com>
Acked-By: default avatarJoao Pinto <jpinto@synopsys.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 610c9087

drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c

+3 −1
Original line number Diff line number Diff line
@@ -116,7 +116,7 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, 
	unsigned int mii_address = priv->hw->mii.addr;

	unsigned int mii_data = priv->hw->mii.data;



	u32 value = MII_WRITE | MII_BUSY;

	u32 value = MII_BUSY;



	value |= (phyaddr << priv->hw->mii.addr_shift)

		& priv->hw->mii.addr_mask;
@@ -126,6 +126,8 @@ static int stmmac_mdio_write(struct mii_bus *bus, int phyaddr, int phyreg, 
		& priv->hw->mii.clk_csr_mask;

	if (priv->plat->has_gmac4)

		value |= MII_GMAC4_WRITE;

	else

		value |= MII_WRITE;



	/* Wait until any existing MII operation is complete */

	if (stmmac_mdio_busy_wait(priv->ioaddr, mii_address))