Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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>

+9 -1
+4
drivers/net/phy/microchip.c
··· 345 345 static struct phy_driver microchip_phy_driver[] = { 346 346 { 347 347 .phy_id = 0x0007c132, 348 + /* This mask (0xfffffff2) is to differentiate from 349 + * LAN8742 (phy_id 0x0007c130 and 0x0007c131) 350 + * and allows future phy_id revisions. 351 + */ 348 352 .phy_id_mask = 0xfffffff2, 349 353 .name = "Microchip LAN88xx", 350 354
+5 -1
drivers/net/phy/smsc.c
··· 484 484 .suspend = genphy_suspend, 485 485 .resume = genphy_resume, 486 486 }, { 487 - .phy_id = 0x0007c130, /* 0x0007c130 and 0x0007c131 */ 487 + .phy_id = 0x0007c130, /* 0x0007c130 and 0x0007c131 */ 488 + /* This mask (0xfffffff2) is to differentiate from 489 + * LAN88xx (phy_id 0x0007c132) 490 + * and allows future phy_id revisions. 491 + */ 488 492 .phy_id_mask = 0xfffffff2, 489 493 .name = "Microchip LAN8742", 490 494