diff options
| author |   Heiner Kallweit <hkallweit1@gmail.com> | 2019-10-28 20:52:55 +0100 |
|---|---|---|
| committer |   David S. Miller <davem@davemloft.net> | 2019-10-29 17:50:10 -0700 |
| commit | 911af5e149bb1116a2aebb5e7ae5f380caa2d7a1 (patch) | |
| tree | f617fd6aa560887cda95a3d7286cba40ca74ea75 /drivers/net/phy/marvell.c | |
| parent | net: phy: marvell: fix typo in constant MII_M1011_PHY_SRC_DOWNSHIFT_MASK (diff) | |
| download | linux-dev-911af5e149bb1116a2aebb5e7ae5f380caa2d7a1.tar.xz linux-dev-911af5e149bb1116a2aebb5e7ae5f380caa2d7a1.zip | |
net: phy: marvell: fix downshift function naming
I got access to the M88E1111 datasheet, and this PHY version uses
another register for downshift configuration. Therefore change prefix
to m88e1011, aligned with constants like MII_M1011_PHY_SCR.
Fixes: a3bdfce7bf9c ("net: phy: marvell: support downshift as PHY tunable")
Reported-by: Chris Healy <Chris.Healy@zii.aero>
Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Reviewed-by: Florian Fainelli <f.fainelli@gmail.com>
Signed-off-by: David S. Miller <davem@davemloft.net>
Diffstat (limited to '')
| -rw-r--r-- | drivers/net/phy/marvell.c | 30 |
1 files changed, 15 insertions, 15 deletions
diff --git a/drivers/net/phy/marvell.c b/drivers/net/phy/marvell.c index e77fc25babe4..68ef84c234a4 100644 --- a/drivers/net/phy/marvell.c +++ b/drivers/net/phy/marvell.c @@ -784,7 +784,7 @@ static int m88e1111_config_init(struct phy_device *phydev) return genphy_soft_reset(phydev); } -static int m88e1111_get_downshift(struct phy_device *phydev, u8 *data) +static int m88e1011_get_downshift(struct phy_device *phydev, u8 *data) { int val, cnt, enable; @@ -800,7 +800,7 @@ static int m88e1111_get_downshift(struct phy_device *phydev, u8 *data) return 0; } -static int m88e1111_set_downshift(struct phy_device *phydev, u8 cnt) +static int m88e1011_set_downshift(struct phy_device *phydev, u8 cnt) { int val; @@ -820,29 +820,29 @@ static int m88e1111_set_downshift(struct phy_device *phydev, u8 cnt) val); } -static int m88e1111_get_tunable(struct phy_device *phydev, +static int m88e1011_get_tunable(struct phy_device *phydev, struct ethtool_tunable *tuna, void *data) { switch (tuna->id) { case ETHTOOL_PHY_DOWNSHIFT: - return m88e1111_get_downshift(phydev, data); + return m88e1011_get_downshift(phydev, data); default: return -EOPNOTSUPP; } } -static int m88e1111_set_tunable(struct phy_device *phydev, +static int m88e1011_set_tunable(struct phy_device *phydev, struct ethtool_tunable *tuna, const void *data) { switch (tuna->id) { case ETHTOOL_PHY_DOWNSHIFT: - return m88e1111_set_downshift(phydev, *(const u8 *)data); + return m88e1011_set_downshift(phydev, *(const u8 *)data); default: return -EOPNOTSUPP; } } -static void m88e1111_link_change_notify(struct phy_device *phydev) +static void m88e1011_link_change_notify(struct phy_device *phydev) { int status; @@ -875,7 +875,7 @@ static int m88e1116r_config_init(struct phy_device *phydev) if (err < 0) return err; - err = m88e1111_set_downshift(phydev, 8); + err = m88e1011_set_downshift(phydev, 8); if (err < 0) return err; @@ -1177,7 +1177,7 @@ static int m88e1540_get_tunable(struct phy_device *phydev, case ETHTOOL_PHY_FAST_LINK_DOWN: return m88e1540_get_fld(phydev, data); case ETHTOOL_PHY_DOWNSHIFT: - return m88e1111_get_downshift(phydev, data); + return m88e1011_get_downshift(phydev, data); default: return -EOPNOTSUPP; } @@ -1190,7 +1190,7 @@ static int m88e1540_set_tunable(struct phy_device *phydev, case ETHTOOL_PHY_FAST_LINK_DOWN: return m88e1540_set_fld(phydev, data); case ETHTOOL_PHY_DOWNSHIFT: - return m88e1111_set_downshift(phydev, *(const u8 *)data); + return m88e1011_set_downshift(phydev, *(const u8 *)data); default: return -EOPNOTSUPP; } @@ -2283,9 +2283,9 @@ static struct phy_driver marvell_drivers[] = { .get_sset_count = marvell_get_sset_count, .get_strings = marvell_get_strings, .get_stats = marvell_get_stats, - .get_tunable = m88e1111_get_tunable, - .set_tunable = m88e1111_set_tunable, - .link_change_notify = m88e1111_link_change_notify, + .get_tunable = m88e1011_get_tunable, + .set_tunable = m88e1011_set_tunable, + .link_change_notify = m88e1011_link_change_notify, }, { .phy_id = MARVELL_PHY_ID_88E1318S, @@ -2425,7 +2425,7 @@ static struct phy_driver marvell_drivers[] = { .get_stats = marvell_get_stats, .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, - .link_change_notify = m88e1111_link_change_notify, + .link_change_notify = m88e1011_link_change_notify, }, { .phy_id = MARVELL_PHY_ID_88E1545, @@ -2488,7 +2488,7 @@ static struct phy_driver marvell_drivers[] = { .get_stats = marvell_get_stats, .get_tunable = m88e1540_get_tunable, .set_tunable = m88e1540_set_tunable, - .link_change_notify = m88e1111_link_change_notify, + .link_change_notify = m88e1011_link_change_notify, }, }; |