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

Commit a70b966c authored by Andrew Lunn's avatar Andrew Lunn Committed by Greg Kroah-Hartman
Browse files

net/phy/mdio-i2c: Move header file to include/linux/mdio 



[ Upstream commit fcba68bd75bb1d42b3aec7f471d382a9e639a672 ]

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: default avatarFlorian Fainelli <f.fainelli@gmail.com>
Signed-off-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
Stable-dep-of: 7083df59abbc ("net: mdio-mux-meson-g12a: force internal PHY off on mux switch")
Signed-off-by: default avatarSasha Levin <sashal@kernel.org>
parent a9a022a0

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -14661,6 +14661,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

drivers/net/phy/mdio-i2c.c

+1 −2
Original line number Diff line number Diff line
@@ -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

drivers/net/phy/sfp.c

+1 −1
Original line number Diff line number Diff line
@@ -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"