summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorAtsushi Nemoto <atsushi.nemoto@sord.co.jp>2020-04-10 12:16:16 +0900
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-04-21 09:04:46 +0200
commit81dc4e9bff98f9be1136bf658a226dfe5a603a56 (patch)
tree5ff086b65605b0961f807fea6e8f7b155ad8ab6d
parenta9a851f0ec67939e4a08b66b49d2206edd051584 (diff)
downloadlinux-stable-81dc4e9bff98f9be1136bf658a226dfe5a603a56.tar.gz
linux-stable-81dc4e9bff98f9be1136bf658a226dfe5a603a56.tar.bz2
linux-stable-81dc4e9bff98f9be1136bf658a226dfe5a603a56.zip
net: phy: micrel: use genphy_read_status for KSZ9131
[ Upstream commit 68dac3eb50be32957ae6e1e6da9281a3b7c6658b ] KSZ9131 will not work with some switches due to workaround for KSZ9031 introduced in commit d2fd719bcb0e83cb39cfee22ee800f98a56eceb3 ("net/phy: micrel: Add workaround for bad autoneg"). Use genphy_read_status instead of dedicated ksz9031_read_status. Fixes: bff5b4b37372 ("net: phy: micrel: add Microchip KSZ9131 initial driver") Signed-off-by: Atsushi Nemoto <atsushi.nemoto@sord.co.jp> Signed-off-by: David S. Miller <davem@davemloft.net> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--drivers/net/phy/micrel.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 51b64f087717..663c68ed6ef9 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -1154,7 +1154,7 @@ static struct phy_driver ksphy_driver[] = {
.driver_data = &ksz9021_type,
.probe = kszphy_probe,
.config_init = ksz9131_config_init,
- .read_status = ksz9031_read_status,
+ .read_status = genphy_read_status,
.ack_interrupt = kszphy_ack_interrupt,
.config_intr = kszphy_config_intr,
.get_sset_count = kszphy_get_sset_count,