diff options
| author | David S. Miller <davem@davemloft.net> | 2015-10-23 05:57:53 -0700 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2015-10-23 05:57:53 -0700 |
| commit | 654c9c543ac025f4ecb73047f2e5b689137c77c5 (patch) | |
| tree | d0442f566f6f6989e2ee351c1f46cad546a7c7e3 /include/linux | |
| parent | 6fb3b6b57ae444d7723088656dce86b1be92498d (diff) | |
| parent | f0505610505caf8443cd5ea269a7936b64711fee (diff) | |
Merge branch 'mdiobus_nested_read_write'
Neil Armstrong says:
====================
Refactor nested mdiobus read/write functions
In order to avoid locked signal false positive for nested mdiobus
read/write calls, nested code was introduced in mv88e6xxx and
mdio-mux.
But mv88e6060 also needs such nested mdiobus read/write calls.
For sake of refactoring, introduce nested variants of mdiobus read/write
and make them used by mv88e6xxx and mv88e6060.
In a next patch, mdio-mux should also use these variant calls.
====================
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to 'include/linux')
| -rw-r--r-- | include/linux/phy.h | 2 |
1 files changed, 2 insertions, 0 deletions
diff --git a/include/linux/phy.h b/include/linux/phy.h index 4c477e6ece33..05fde31b6dc6 100644 --- a/include/linux/phy.h +++ b/include/linux/phy.h @@ -213,7 +213,9 @@ static inline struct mii_bus *devm_mdiobus_alloc(struct device *dev) void devm_mdiobus_free(struct device *dev, struct mii_bus *bus); struct phy_device *mdiobus_scan(struct mii_bus *bus, int addr); int mdiobus_read(struct mii_bus *bus, int addr, u32 regnum); +int mdiobus_read_nested(struct mii_bus *bus, int addr, u32 regnum); int mdiobus_write(struct mii_bus *bus, int addr, u32 regnum, u16 val); +int mdiobus_write_nested(struct mii_bus *bus, int addr, u32 regnum, u16 val); #define PHY_INTERRUPT_DISABLED 0x0 |