diff options
| author | Andrew Lunn <andrew@lunn.ch> | 2020-08-27 05:00:29 +0300 |
|---|---|---|
| committer | David S. Miller <davem@davemloft.net> | 2020-08-27 16:55:50 +0300 |
| commit | fcba68bd75bb1d42b3aec7f471d382a9e639a672 (patch) | |
| tree | c644f0420a77433594514771b443f893dd40ae95 | |
| parent | 2fa4e4b799e191530edbae4b96b85d4486e55053 (diff) | |
| download | linux-fcba68bd75bb1d42b3aec7f471d382a9e639a672.tar.xz | |
net/phy/mdio-i2c: Move header file to include/linux/mdio
In preparation for moving all MDIO drivers into drivers/net/mdio, move
the mdio-i2c header file into include/linux/mdio so it can be used by
both the MDIO driver and the SFP code which instantiates I2C MDIO
busses.
v2:
Add include/linux/mdio
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
| -rw-r--r-- | MAINTAINERS | 1 | ||||
| -rw-r--r-- | drivers/net/phy/mdio-i2c.c | 3 | ||||
| -rw-r--r-- | drivers/net/phy/sfp.c | 2 | ||||
| -rw-r--r-- | include/linux/mdio/mdio-i2c.h (renamed from drivers/net/phy/mdio-i2c.h) | 0 |
4 files changed, 3 insertions, 3 deletions
diff --git a/MAINTAINERS b/MAINTAINERS index 347ed6904fdf..af25e8d003e7 100644 --- a/MAINTAINERS +++ b/MAINTAINERS @@ -15647,6 +15647,7 @@ L: netdev@vger.kernel.org S: Maintained F: drivers/net/phy/phylink.c F: drivers/net/phy/sfp* +F: include/linux/mdio/mdio-i2c.h F: include/linux/phylink.h F: include/linux/sfp.h K: phylink\.h|struct\s+phylink|\.phylink|>phylink_|phylink_(autoneg|clear|connect|create|destroy|disconnect|ethtool|helper|mac|mii|of|set|start|stop|test|validate) diff --git a/drivers/net/phy/mdio-i2c.c b/drivers/net/phy/mdio-i2c.c index 0746e2cc39ae..09200a70b315 100644 --- a/drivers/net/phy/mdio-i2c.c +++ b/drivers/net/phy/mdio-i2c.c @@ -10,10 +10,9 @@ * of their settings. */ #include <linux/i2c.h> +#include <linux/mdio/mdio-i2c.h> #include <linux/phy.h> -#include "mdio-i2c.h" - /* * I2C bus addresses 0x50 and 0x51 are normally an EEPROM, which is * specified to be present in SFP modules. These correspond with PHY diff --git a/drivers/net/phy/sfp.c b/drivers/net/phy/sfp.c index c24b0e83dd32..5250dcdf46a4 100644 --- a/drivers/net/phy/sfp.c +++ b/drivers/net/phy/sfp.c @@ -7,6 +7,7 @@ #include <linux/i2c.h> #include <linux/interrupt.h> #include <linux/jiffies.h> +#include <linux/mdio/mdio-i2c.h> #include <linux/module.h> #include <linux/mutex.h> #include <linux/of.h> @@ -16,7 +17,6 @@ #include <linux/slab.h> #include <linux/workqueue.h> -#include "mdio-i2c.h" #include "sfp.h" #include "swphy.h" diff --git a/drivers/net/phy/mdio-i2c.h b/include/linux/mdio/mdio-i2c.h index b1d27f7cd23f..b1d27f7cd23f 100644 --- a/drivers/net/phy/mdio-i2c.h +++ b/include/linux/mdio/mdio-i2c.h |