Commit 0fca947c authored by Marek Behún's avatar Marek Behún Committed by David S. Miller
Browse files

net: phy: marvell10g: differentiate 88E2110 vs 88E2111 



88E2111 is a variant of 88E2110 which does not support 5 gigabit speeds.

Differentiate these variants via the match_phy_device() method, since
they have the same PHY ID.

Signed-off-by: default avatarMarek Behún <kabel@kernel.org>
Reviewed-by: default avatarAndrew Lunn <andrew@lunn.ch>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 53f111cb

drivers/net/phy/marvell10g.c

+62 −0
Original line number Diff line number Diff line
@@ -918,6 +918,14 @@ static void mv2110_init_supported_interfaces(unsigned long *mask) 
	__set_bit(PHY_INTERFACE_MODE_USXGMII, mask);

}



static void mv2111_init_supported_interfaces(unsigned long *mask)

{

	__set_bit(PHY_INTERFACE_MODE_SGMII, mask);

	__set_bit(PHY_INTERFACE_MODE_2500BASEX, mask);

	__set_bit(PHY_INTERFACE_MODE_10GBASER, mask);

	__set_bit(PHY_INTERFACE_MODE_USXGMII, mask);

}



static const struct mv3310_chip mv3310_type = {

	.init_supported_interfaces = mv3310_init_supported_interfaces,

	.get_mactype = mv3310_get_mactype,
@@ -948,6 +956,41 @@ static const struct mv3310_chip mv2110_type = { 
#endif

};



static const struct mv3310_chip mv2111_type = {

	.init_supported_interfaces = mv2111_init_supported_interfaces,

	.get_mactype = mv2110_get_mactype,

	.init_interface = mv2110_init_interface,



#ifdef CONFIG_HWMON

	.hwmon_read_temp_reg = mv2110_hwmon_read_temp_reg,

#endif

};



static int mv211x_match_phy_device(struct phy_device *phydev, bool has_5g)

{

	int val;



	if ((phydev->c45_ids.device_ids[MDIO_MMD_PMAPMD] &

	     MARVELL_PHY_ID_MASK) != MARVELL_PHY_ID_88E2110)

		return 0;



	val = phy_read_mmd(phydev, MDIO_MMD_PCS, MDIO_SPEED);

	if (val < 0)

		return val;



	return !!(val & MDIO_PCS_SPEED_5G) == has_5g;

}



static int mv2110_match_phy_device(struct phy_device *phydev)

{

	return mv211x_match_phy_device(phydev, true);

}



static int mv2111_match_phy_device(struct phy_device *phydev)

{

	return mv211x_match_phy_device(phydev, false);

}



static struct phy_driver mv3310_drivers[] = {

	{

		.phy_id		= MARVELL_PHY_ID_88X3310,
@@ -988,6 +1031,7 @@ static struct phy_driver mv3310_drivers[] = { 
	{

		.phy_id		= MARVELL_PHY_ID_88E2110,

		.phy_id_mask	= MARVELL_PHY_ID_MASK,

		.match_phy_device = mv2110_match_phy_device,

		.name		= "mv88e2110",

		.driver_data	= &mv2110_type,

		.probe		= mv3310_probe,
@@ -1002,6 +1046,24 @@ static struct phy_driver mv3310_drivers[] = { 
		.remove		= mv3310_remove,

		.set_loopback	= genphy_c45_loopback,

	},

	{

		.phy_id		= MARVELL_PHY_ID_88E2110,

		.phy_id_mask	= MARVELL_PHY_ID_MASK,

		.match_phy_device = mv2111_match_phy_device,

		.name		= "mv88e2111",

		.driver_data	= &mv2111_type,

		.probe		= mv3310_probe,

		.suspend	= mv3310_suspend,

		.resume		= mv3310_resume,

		.config_init	= mv3310_config_init,

		.config_aneg	= mv3310_config_aneg,

		.aneg_done	= mv3310_aneg_done,

		.read_status	= mv3310_read_status,

		.get_tunable	= mv3310_get_tunable,

		.set_tunable	= mv3310_set_tunable,

		.remove		= mv3310_remove,

		.set_loopback	= genphy_c45_loopback,

	},

};



module_phy_driver(mv3310_drivers);