| Message ID | 20220504152822.11890-2-yuiko.oshino@microchip.com (mailing list archive) |
|---|---|
| State | Superseded |
| Delegated to: | Netdev Maintainers |
| Headers | show |
| Series | net: phy: add LAN8742 phy support | expand |
On Wed, May 04, 2022 at 08:28:21AM -0700, Yuiko Oshino wrote: > update LAN88xx phy ID and phy ID mask because the existing code conflicts with the LAN8742 phy. > > The current phy IDs on the available hardware. > LAN8742 0x0007C130, 0x0007C131 > LAN88xx 0x0007C132 > > Signed-off-by: Yuiko Oshino <yuiko.oshino@microchip.com> > static struct phy_driver microchip_phy_driver[] = { > { > - .phy_id = 0x0007c130, > - .phy_id_mask = 0xfffffff0, > + .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, It is odd, but you should be able to change your mind later if the hardware engineers don't actually stick to this odd scheme. Reviewed-by: Andrew Lunn <andrew@lunn.ch> Andrew
diff --git a/drivers/net/phy/microchip.c b/drivers/net/phy/microchip.c index 9f1f2b6c97d4..ccecee2524ce 100644 --- a/drivers/net/phy/microchip.c +++ b/drivers/net/phy/microchip.c @@ -344,8 +344,12 @@ static int lan88xx_config_aneg(struct phy_device *phydev) static struct phy_driver microchip_phy_driver[] = { { - .phy_id = 0x0007c130, - .phy_id_mask = 0xfffffff0, + .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", /* PHY_GBIT_FEATURES */ @@ -369,7 +373,7 @@ static struct phy_driver microchip_phy_driver[] = { module_phy_driver(microchip_phy_driver); static struct mdio_device_id __maybe_unused microchip_tbl[] = { - { 0x0007c130, 0xfffffff0 }, + { 0x0007c132, 0xfffffff2 }, { } };
update LAN88xx phy ID and phy ID mask because the existing code conflicts with the LAN8742 phy. The current phy IDs on the available hardware. LAN8742 0x0007C130, 0x0007C131 LAN88xx 0x0007C132 Signed-off-by: Yuiko Oshino <yuiko.oshino@microchip.com> --- drivers/net/phy/microchip.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-)