From: Steve Bennett <steveb@workware.net.au>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Steve Bennett <steveb@workware.net.au>
Subject: [PATCH] net: phy: micrel: Fix detection of ksz87xx switch
Date: Fri, 30 Jul 2021 20:51:20 +1000 [thread overview]
Message-ID: <20210730105120.93743-1-steveb@workware.net.au> (raw)
The previous logic was wrong such that the ksz87xx
switch was not identified correctly.
Signed-off-by: Steve Bennett <steveb@workware.net.au>
---
drivers/net/phy/micrel.c | 10 +++++-----
1 file changed, 5 insertions(+), 5 deletions(-)
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index 4d53886f7d51..a4acec02c8cb 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -401,11 +401,11 @@ static int ksz8041_config_aneg(struct phy_device *phydev)
}
static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev,
- const u32 ksz_phy_id)
+ const u32 ksz_8051)
{
int ret;
- if ((phydev->phy_id & MICREL_PHY_ID_MASK) != ksz_phy_id)
+ if ((phydev->phy_id & MICREL_PHY_ID_MASK) != PHY_ID_KSZ8051)
return 0;
ret = phy_read(phydev, MII_BMSR);
@@ -418,7 +418,7 @@ static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev,
* the switch does not.
*/
ret &= BMSR_ERCAP;
- if (ksz_phy_id == PHY_ID_KSZ8051)
+ if (ksz_8051)
return ret;
else
return !ret;
@@ -426,7 +426,7 @@ static int ksz8051_ksz8795_match_phy_device(struct phy_device *phydev,
static int ksz8051_match_phy_device(struct phy_device *phydev)
{
- return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ8051);
+ return ksz8051_ksz8795_match_phy_device(phydev, 1);
}
static int ksz8081_config_init(struct phy_device *phydev)
@@ -535,7 +535,7 @@ static int ksz8061_config_init(struct phy_device *phydev)
static int ksz8795_match_phy_device(struct phy_device *phydev)
{
- return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ87XX);
+ return ksz8051_ksz8795_match_phy_device(phydev, 0);
}
static int ksz9021_load_values_from_of(struct phy_device *phydev,
--
2.24.2 (Apple Git-127)
next reply other threads:[~2021-07-30 10:51 UTC|newest]
Thread overview: 10+ messages / expand[flat|nested] mbox.gz Atom feed top
2021-07-30 10:51 Steve Bennett [this message]
2021-07-30 16:59 ` [PATCH] net: phy: micrel: Fix detection of ksz87xx switch Jakub Kicinski
2021-07-30 22:19 ` Steve Bennett
2021-08-07 0:01 ` Ben Hutchings
2021-08-07 0:06 ` [PATCH net] net: phy: micrel: Fix link detection on ksz87xx switch" Ben Hutchings
2021-08-08 11:10 ` patchwork-bot+netdevbpf
2021-08-08 22:18 ` [PATCH] net: phy: micrel: Fix detection of ksz87xx switch Steve Bennett
2021-07-30 22:57 ` [PATCH v2] " Steve Bennett
2021-07-30 23:08 ` Marek Vasut
2021-08-02 14:10 ` patchwork-bot+netdevbpf
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=20210730105120.93743-1-steveb@workware.net.au \
--to=steveb@workware.net.au \
--cc=linux-kernel@vger.kernel.org \
--cc=netdev@vger.kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).