From: Michael Walle <michael@walle.cc>
To: netdev@vger.kernel.org, linux-kernel@vger.kernel.org
Cc: Andrew Lunn <andrew@lunn.ch>,
Florian Fainelli <f.fainelli@gmail.com>,
Heiner Kallweit <hkallweit1@gmail.com>,
Russell King <linux@armlinux.org.uk>,
"David S . Miller" <davem@davemloft.net>,
Michael Walle <michael@walle.cc>
Subject: [PATCH net-next 4/4] net: phy: bcm54140: add second PHY ID
Date: Tue, 28 Apr 2020 23:08:54 +0200 [thread overview]
Message-ID: <20200428210854.28088-4-michael@walle.cc> (raw)
In-Reply-To: <20200428210854.28088-1-michael@walle.cc>
This PHY have to PHY IDs depending on its mode. Adjust the mask so that
it includes both IDs.
Also move the PHY_ID_BCM54140 out of the brcmphy.h into the driver to
have the mask and the ID in one place.
Signed-off-by: Michael Walle <michael@walle.cc>
---
drivers/net/phy/bcm54140.c | 12 ++++++++++--
include/linux/brcmphy.h | 1 -
2 files changed, 10 insertions(+), 3 deletions(-)
diff --git a/drivers/net/phy/bcm54140.c b/drivers/net/phy/bcm54140.c
index d73cbddbc69b..6c54f067c7fb 100644
--- a/drivers/net/phy/bcm54140.c
+++ b/drivers/net/phy/bcm54140.c
@@ -115,6 +115,14 @@
#define BCM54140_HWMON_IN_ALARM_BIT(ch) ((ch) ? BCM54140_RDB_MON_ISR_3V3 \
: BCM54140_RDB_MON_ISR_1V0)
+/* This PHY has two different PHY IDs depening on its MODE_SEL pin. This
+ * pin choses between 4x SGMII and QSGMII mode:
+ * AE02_5009 4x SGMII
+ * AE02_5019 QSGMII
+ */
+#define PHY_ID_BCM54140 0xae025009
+#define BCM54140_PHY_ID_MASK 0xffffffe8
+
#define BCM54140_PHY_ID_REV(phy_id) ((phy_id) & 0x7)
#define BCM54140_REV_B0 1
@@ -857,7 +865,7 @@ static int bcm54140_set_tunable(struct phy_device *phydev,
static struct phy_driver bcm54140_drivers[] = {
{
.phy_id = PHY_ID_BCM54140,
- .phy_id_mask = 0xfffffff8,
+ .phy_id_mask = BCM54140_PHY_ID_MASK,
.name = "Broadcom BCM54140",
.features = PHY_GBIT_FEATURES,
.config_init = bcm54140_config_init,
@@ -875,7 +883,7 @@ static struct phy_driver bcm54140_drivers[] = {
module_phy_driver(bcm54140_drivers);
static struct mdio_device_id __maybe_unused bcm54140_tbl[] = {
- { PHY_ID_BCM54140, 0xfffffff8 },
+ { PHY_ID_BCM54140, BCM54140_PHY_ID_MASK },
{ }
};
diff --git a/include/linux/brcmphy.h b/include/linux/brcmphy.h
index 8be150e69c7c..897b69309964 100644
--- a/include/linux/brcmphy.h
+++ b/include/linux/brcmphy.h
@@ -25,7 +25,6 @@
#define PHY_ID_BCM5461 0x002060c0
#define PHY_ID_BCM54612E 0x03625e60
#define PHY_ID_BCM54616S 0x03625d10
-#define PHY_ID_BCM54140 0xae025019
#define PHY_ID_BCM57780 0x03625d90
#define PHY_ID_BCM89610 0x03625cd0
--
2.20.1
next prev parent reply other threads:[~2020-04-28 21:09 UTC|newest]
Thread overview: 12+ messages / expand[flat|nested] mbox.gz Atom feed top
2020-04-28 21:08 [PATCH net-next 1/4] net: phy: bcm54140: use genphy_soft_reset() Michael Walle
2020-04-28 21:08 ` [PATCH net-next 2/4] net: phy: bcm54140: fix phy_id_mask Michael Walle
2020-04-28 21:22 ` Andrew Lunn
2020-04-28 22:31 ` Florian Fainelli
2020-04-28 21:08 ` [PATCH net-next 3/4] net: phy: bcm54140: apply the workaround on b0 chips Michael Walle
2020-04-28 21:23 ` Andrew Lunn
2020-04-28 22:31 ` Florian Fainelli
2020-04-28 21:08 ` Michael Walle [this message]
2020-04-28 21:29 ` [PATCH net-next 4/4] net: phy: bcm54140: add second PHY ID Andrew Lunn
2020-04-28 22:08 ` Michael Walle
2020-04-28 22:33 ` Florian Fainelli
2020-04-28 22:28 ` [PATCH net-next 1/4] net: phy: bcm54140: use genphy_soft_reset() Florian Fainelli
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=20200428210854.28088-4-michael@walle.cc \
--to=michael@walle.cc \
--cc=andrew@lunn.ch \
--cc=davem@davemloft.net \
--cc=f.fainelli@gmail.com \
--cc=hkallweit1@gmail.com \
--cc=linux-kernel@vger.kernel.org \
--cc=linux@armlinux.org.uk \
--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).