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>
mariux64 · May 11, 2022 · 53a332f · 53a332f
2 parents 0781434 + b2be075
commit 53a332f
Show file tree

Hide file tree

Showing 2 changed files with 9 additions and 1 deletion.
diff --git 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
@@ -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",