Commit 190e6e29 authored by Florian Fainelli's avatar Florian Fainelli Committed by David S. Miller

net: r6040: Use logical or for MDIO operations

This is not a functional change, but we should be using a logical or to
assign the bits we will be writing to the MDIO read and write registers.
Signed-off-by: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0056982f
...@@ -200,7 +200,7 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg) ...@@ -200,7 +200,7 @@ static int r6040_phy_read(void __iomem *ioaddr, int phy_addr, int reg)
int limit = MAC_DEF_TIMEOUT; int limit = MAC_DEF_TIMEOUT;
u16 cmd; u16 cmd;
iowrite16(MDIO_READ + reg + (phy_addr << 8), ioaddr + MMDIO); iowrite16(MDIO_READ | reg | (phy_addr << 8), ioaddr + MMDIO);
/* Wait for the read bit to be cleared */ /* Wait for the read bit to be cleared */
while (limit--) { while (limit--) {
cmd = ioread16(ioaddr + MMDIO); cmd = ioread16(ioaddr + MMDIO);
...@@ -224,7 +224,7 @@ static int r6040_phy_write(void __iomem *ioaddr, ...@@ -224,7 +224,7 @@ static int r6040_phy_write(void __iomem *ioaddr,
iowrite16(val, ioaddr + MMWD); iowrite16(val, ioaddr + MMWD);
/* Write the command to the MDIO bus */ /* Write the command to the MDIO bus */
iowrite16(MDIO_WRITE + reg + (phy_addr << 8), ioaddr + MMDIO); iowrite16(MDIO_WRITE | reg | (phy_addr << 8), ioaddr + MMDIO);
/* Wait for the write bit to be cleared */ /* Wait for the write bit to be cleared */
while (limit--) { while (limit--) {
cmd = ioread16(ioaddr + MMDIO); cmd = ioread16(ioaddr + MMDIO);
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment