diff options
| author | Jakub Kicinski <kuba@kernel.org> | 2022-05-10 18:57:17 -0700 |
|---|---|---|
| committer | Jakub Kicinski <kuba@kernel.org> | 2022-05-10 18:57:17 -0700 |
| commit | 53a332f222c015cb82349fd4f6b58cb14f574e8d (patch) | |
| tree | a9990bb335e5092fc67826558fcae4d3647e83bf | |
| parent | 0781434af811f29a0808521533bedc4027685751 (diff) | |
| parent | b2be075139fa4dad1649edef30963de6315ba237 (diff) | |
Merge branch 'net-phy-add-comments-for-lan8742-phy-support'
Yuiko Oshino says:
====================
net: phy: add comments for LAN8742 phy support
Add comments for 0xfffffff2 phy ID mask for the LAN8742 and the LAN88xx, explaining that they can coexist and allow future hardware revisions.
Also add one missing tab in smsc.c.
====================
Link: https://lore.kernel.org/r/20220509185804.7147-1-yuiko.oshino@microchip.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>
| -rw-r--r-- | drivers/net/phy/microchip.c | 4 | ||||
| -rw-r--r-- | drivers/net/phy/smsc.c | 6 |
2 files changed, 9 insertions, 1 deletions
diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c index 131caf659ed2..ccecee2524ce 100644 --- a/drivers/net/phy/microchip.c +++ b/drivers/net/phy/microchip.c @@ -345,6 +345,10 @@ static int lan88xx_config_aneg(struct phy_device *phydev) static struct phy_driver microchip_phy_driver[] = { { .phy_id = 0x0007c132, + /* This mask (0xfffffff2) is to differentiate from + * LAN8742 (phy_id 0x0007c130 and 0x0007c131) + * and allows future phy_id revisions. + */ .phy_id_mask = 0xfffffff2, .name = "Microchip LAN88xx", diff --git a/drivers/net/phy/smsc.c b/drivers/net/phy/smsc.c index 44fa9e00cc50..92225d0fc246 100644 --- a/drivers/net/phy/smsc.c +++ b/drivers/net/phy/smsc.c @@ -484,7 +484,11 @@ static struct phy_driver smsc_phy_driver[] = { .suspend = genphy_suspend, .resume = genphy_resume, }, { - .phy_id = 0x0007c130, /* 0x0007c130 and 0x0007c131 */ + .phy_id = 0x0007c130, /* 0x0007c130 and 0x0007c131 */ + /* This mask (0xfffffff2) is to differentiate from + * LAN88xx (phy_id 0x0007c132) + * and allows future phy_id revisions. + */ .phy_id_mask = 0xfffffff2, .name = "Microchip LAN8742", |