hollalinux
/
linux-sg2042
mirror of https://github.com/sophgo/linux-riscv.git
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

net: phy: convert micrel to new read_mmd/write_mmd driver methods 

Convert micrel to the new read_mmd/write_mmd driver methods.  This
Clause 22 PHY does not support any MMD access method.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: Russell King <rmk+kernel@armlinux.org.uk>
Signed-off-by: David S. Miller <davem@davemloft.net>
This commit is contained in:
Russell King 2017-03-21 16:36:58 +00:00 committed by David S. Miller
parent a6d99fcd3f
commit d11437e0af
1 changed files with 6 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

13
drivers/net/phy/micrel.c
View File

@ -637,8 +637,7 @@ static int ksz8873mll_config_aneg(struct phy_device *phydev)
* MMD extended PHY registers. * MMD extended PHY registers.
*/ */
static int static int
ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum, ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int devad, u16 regnum)
int regnum)
{ {
return -1; return -1;
} }
@ -646,10 +645,10 @@ ksz9021_rd_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum,
/* This routine does nothing since the Micrel ksz9021 does not support /* This routine does nothing since the Micrel ksz9021 does not support
* standard IEEE MMD extended PHY registers. * standard IEEE MMD extended PHY registers.
*/ */
static void static int
ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int ptrad, int devnum, ksz9021_wr_mmd_phyreg(struct phy_device *phydev, int devad, u16 regnum, u16 val)
int regnum, u32 val)
{ {
return -1;
} }
static int kszphy_get_sset_count(struct phy_device *phydev) static int kszphy_get_sset_count(struct phy_device *phydev)
@ -962,8 +961,8 @@ static struct phy_driver ksphy_driver[] = {
.get_stats = kszphy_get_stats, .get_stats = kszphy_get_stats,
.suspend = genphy_suspend, .suspend = genphy_suspend,
.resume = genphy_resume, .resume = genphy_resume,
.read_mmd_indirect = ksz9021_rd_mmd_phyreg, .read_mmd = ksz9021_rd_mmd_phyreg,
.write_mmd_indirect = ksz9021_wr_mmd_phyreg, .write_mmd = ksz9021_wr_mmd_phyreg,
}, { }, {
.phy_id = PHY_ID_KSZ9031, .phy_id = PHY_ID_KSZ9031,
.phy_id_mask = MICREL_PHY_ID_MASK, .phy_id_mask = MICREL_PHY_ID_MASK,