Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 631ba906 authored by Maxime Chevallier's avatar Maxime Chevallier Committed by David S. Miller
Browse files

net: phy: marvell10g: Use a #define for 88X3310 family id 



The PHY ID corresponding to the 88X3310 is also used for other PHYs in
the same family, such as the 88E2010. Use a #define for the PHY id, that
ignores the last nibble.

Signed-off-by: default avatarMaxime Chevallier <maxime.chevallier@bootlin.com>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent e555e5b1

drivers/net/phy/marvell10g.c

+2 −2
Original line number Diff line number Diff line
@@ -430,7 +430,7 @@ static int mv3310_read_status(struct phy_device *phydev) 


static struct phy_driver mv3310_drivers[] = {

	{

		.phy_id		= 0x002b09aa,

		.phy_id		= MARVELL_PHY_ID_88X3310,

		.phy_id_mask	= MARVELL_PHY_ID_MASK,

		.name		= "mv88x3310",

		.get_features	= mv3310_get_features,
@@ -448,7 +448,7 @@ static struct phy_driver mv3310_drivers[] = { 
module_phy_driver(mv3310_drivers);



static struct mdio_device_id __maybe_unused mv3310_tbl[] = {

	{ 0x002b09aa, MARVELL_PHY_ID_MASK },

	{ MARVELL_PHY_ID_88X3310, MARVELL_PHY_ID_MASK },

	{ },

};

MODULE_DEVICE_TABLE(mdio, mv3310_tbl);

include/linux/marvell_phy.h

+1 −0
Original line number Diff line number Diff line
@@ -20,6 +20,7 @@ 
#define MARVELL_PHY_ID_88E1540		0x01410eb0

#define MARVELL_PHY_ID_88E1545		0x01410ea0

#define MARVELL_PHY_ID_88E3016		0x01410e60

#define MARVELL_PHY_ID_88X3310		0x002b09a0



/* The MV88e6390 Ethernet switch contains embedded PHYs. These PHYs do

 * not have a model ID. So the switch driver traps reads to the ID2