diff options
| author | Shengzhou Liu <Shengzhou.Liu@freescale.com> | 2015-04-07 18:46:32 +0800 |
|---|---|---|
| committer | Joe Hershberger <joe.hershberger@ni.com> | 2015-04-20 17:57:13 -0500 |
| commit | 5707d5ffd42a45088f433a2514d1320a6491697b (patch) | |
| tree | 2340b8de0b59f2286df20701951c289cf69da1a7 | |
| parent | c6a40f6e518c4fb900ec6a46a7fc1d1d354beb3a (diff) | |
net/phy: fixup for get_phy_id
commit 3c6928fd7b0f84 "net: phy: fix warnings with W=1" caused
some PHYs(e.g. CS4315/CS4340) not working. This patch fixes the
warning and make those special PHYs working as well.
Signed-off-by: Shengzhou Liu <Shengzhou.Liu@freescale.com>
| -rw-r--r-- | drivers/net/phy/phy.c | 2 | ||||
| -rw-r--r-- | include/phy.h | 1 |
2 files changed, 2 insertions, 1 deletions
diff --git a/drivers/net/phy/phy.c b/drivers/net/phy/phy.c index 9d88afe8fc..f5221a3833 100644 --- a/drivers/net/phy/phy.c +++ b/drivers/net/phy/phy.c @@ -582,7 +582,7 @@ static struct phy_device *phy_device_create(struct mii_dev *bus, int addr, * Description: Reads the ID registers of the PHY at @addr on the * @bus, stores it in @phy_id and returns zero on success. */ -static int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id) +int __weak get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id) { int phy_reg; diff --git a/include/phy.h b/include/phy.h index 384dc2321e..3f826b66f7 100644 --- a/include/phy.h +++ b/include/phy.h @@ -254,6 +254,7 @@ int phy_teranetics_init(void); int phy_vitesse_init(void); int board_phy_config(struct phy_device *phydev); +int get_phy_id(struct mii_dev *bus, int addr, int devad, u32 *phy_id); /** * phy_get_interface_by_name() - Look up a PHY interface name |