lisa/android_kernel_xiaomi_sm8350
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

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

Browse Source 
[ 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: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: David S. Miller <davem@davemloft.net>
Stable-dep-of: 7083df59abbc ("net: mdio-mux-meson-g12a: force internal PHY off on mux switch")
Signed-off-by: Sasha Levin <sashal@kernel.org>
This commit is contained in:
Andrew Lunn 2020-08-27 04:00:29 +02:00 committed by Greg Kroah-Hartman
parent a9a022a0db
commit a70b966c6c
4 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
MAINTAINERS
View File

@ -14661,6 +14661,7 @@ L: netdev@vger.kernel.org
S: Maintained S: Maintained
F: drivers/net/phy/phylink.c F: drivers/net/phy/phylink.c
F: drivers/net/phy/sfp* F: drivers/net/phy/sfp*
F: include/linux/mdio/mdio-i2c.h
F: include/linux/phylink.h F: include/linux/phylink.h
F: include/linux/sfp.h F: include/linux/sfp.h
K: phylink K: phylink

3
drivers/net/phy/mdio-i2c.c
View File

@ -10,10 +10,9 @@
* of their settings. * of their settings.
*/ */
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/mdio/mdio-i2c.h>
#include <linux/phy.h> #include <linux/phy.h>
#include "mdio-i2c.h"
/* /*
* I2C bus addresses 0x50 and 0x51 are normally an EEPROM, which is * I2C bus addresses 0x50 and 0x51 are normally an EEPROM, which is
* specified to be present in SFP modules. These correspond with PHY * specified to be present in SFP modules. These correspond with PHY

2
drivers/net/phy/sfp.c
View File

@ -7,6 +7,7 @@
#include <linux/i2c.h> #include <linux/i2c.h>
#include <linux/interrupt.h> #include <linux/interrupt.h>
#include <linux/jiffies.h> #include <linux/jiffies.h>
#include <linux/mdio/mdio-i2c.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/mutex.h> #include <linux/mutex.h>
#include <linux/of.h> #include <linux/of.h>
@ -16,7 +17,6 @@
#include <linux/slab.h> #include <linux/slab.h>
#include <linux/workqueue.h> #include <linux/workqueue.h>
#include "mdio-i2c.h"
#include "sfp.h" #include "sfp.h"
#include "swphy.h" #include "swphy.h"

0
drivers/net/phy/mdio-i2c.h → include/linux/mdio/mdio-i2c.h
View File