|
@@ -9,17 +9,17 @@
|
|
#include <linux/export.h>
|
|
#include <linux/export.h>
|
|
#include <linux/phy.h>
|
|
#include <linux/phy.h>
|
|
|
|
|
|
-static inline void mmd_phy_indirect(struct mii_bus *bus, int prtad, int devad,
|
|
|
|
- int addr)
|
|
|
|
|
|
+static void mmd_phy_indirect(struct mii_bus *bus, int phy_addr, int devad,
|
|
|
|
+ u16 regnum)
|
|
{
|
|
{
|
|
/* Write the desired MMD Devad */
|
|
/* Write the desired MMD Devad */
|
|
- bus->write(bus, addr, MII_MMD_CTRL, devad);
|
|
|
|
|
|
+ bus->write(bus, phy_addr, MII_MMD_CTRL, devad);
|
|
|
|
|
|
/* Write the desired MMD register address */
|
|
/* Write the desired MMD register address */
|
|
- bus->write(bus, addr, MII_MMD_DATA, prtad);
|
|
|
|
|
|
+ bus->write(bus, phy_addr, MII_MMD_DATA, regnum);
|
|
|
|
|
|
/* Select the Function : DATA with no post increment */
|
|
/* Select the Function : DATA with no post increment */
|
|
- bus->write(bus, addr, MII_MMD_CTRL, (devad | MII_MMD_CTRL_NOINCR));
|
|
|
|
|
|
+ bus->write(bus, phy_addr, MII_MMD_CTRL, devad | MII_MMD_CTRL_NOINCR);
|
|
}
|
|
}
|
|
|
|
|
|
/**
|
|
/**
|
|
@@ -49,7 +49,7 @@ int phy_read_mmd(struct phy_device *phydev, int devad, u32 regnum)
|
|
int phy_addr = phydev->mdio.addr;
|
|
int phy_addr = phydev->mdio.addr;
|
|
|
|
|
|
mutex_lock(&bus->mdio_lock);
|
|
mutex_lock(&bus->mdio_lock);
|
|
- mmd_phy_indirect(bus, regnum, devad, phy_addr);
|
|
|
|
|
|
+ mmd_phy_indirect(bus, phy_addr, devad, regnum);
|
|
|
|
|
|
/* Read the content of the MMD's selected register */
|
|
/* Read the content of the MMD's selected register */
|
|
val = bus->read(bus, phy_addr, MII_MMD_DATA);
|
|
val = bus->read(bus, phy_addr, MII_MMD_DATA);
|
|
@@ -88,7 +88,7 @@ int phy_write_mmd(struct phy_device *phydev, int devad, u32 regnum, u16 val)
|
|
int phy_addr = phydev->mdio.addr;
|
|
int phy_addr = phydev->mdio.addr;
|
|
|
|
|
|
mutex_lock(&bus->mdio_lock);
|
|
mutex_lock(&bus->mdio_lock);
|
|
- mmd_phy_indirect(bus, regnum, devad, phy_addr);
|
|
|
|
|
|
+ mmd_phy_indirect(bus, phy_addr, devad, regnum);
|
|
|
|
|
|
/* Write the data into MMD's selected register */
|
|
/* Write the data into MMD's selected register */
|
|
bus->write(bus, phy_addr, MII_MMD_DATA, val);
|
|
bus->write(bus, phy_addr, MII_MMD_DATA, val);
|