Commit 21f49468 authored by Quentin Schulz's avatar Quentin Schulz Committed by David S. Miller
Browse files

net: phy: vitesse: remove duplicate support for VSC8574 



A more featureful support for VSC8574 was recently added to the
Microsemi (mscc.c) driver. I checked that features supported in the
Vitesse driver are also supported in the Microsemi driver.

Signed-off-by: default avatarQuentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: default avatarDavid S. Miller <davem@davemloft.net>
parent 0cb98e84

drivers/net/phy/vitesse.c

+0 −12
Original line number Diff line number Diff line
@@ -70,7 +70,6 @@ 
#define PHY_ID_VSC8244			0x000fc6c0

#define PHY_ID_VSC8514			0x00070670

#define PHY_ID_VSC8572			0x000704d0

#define PHY_ID_VSC8574			0x000704a0

#define PHY_ID_VSC8601			0x00070420

#define PHY_ID_VSC7385			0x00070450

#define PHY_ID_VSC7388			0x00070480
@@ -303,7 +302,6 @@ static int vsc82xx_config_intr(struct phy_device *phydev) 
			 phydev->drv->phy_id == PHY_ID_VSC8244 ||

			 phydev->drv->phy_id == PHY_ID_VSC8514 ||

			 phydev->drv->phy_id == PHY_ID_VSC8572 ||

			 phydev->drv->phy_id == PHY_ID_VSC8574 ||

			 phydev->drv->phy_id == PHY_ID_VSC8601) ?

				MII_VSC8244_IMASK_MASK :

				MII_VSC8221_IMASK_MASK);
@@ -430,15 +428,6 @@ static struct phy_driver vsc82xx_driver[] = { 
	.config_aneg    = &vsc82x4_config_aneg,

	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

}, {

	.phy_id         = PHY_ID_VSC8574,

	.name           = "Vitesse VSC8574",

	.phy_id_mask    = 0x000ffff0,

	.features       = PHY_GBIT_FEATURES,

	.config_init    = &vsc824x_config_init,

	.config_aneg    = &vsc82x4_config_aneg,

	.ack_interrupt  = &vsc824x_ack_interrupt,

	.config_intr    = &vsc82xx_config_intr,

}, {

	.phy_id         = PHY_ID_VSC8601,

	.name           = "Vitesse VSC8601",
@@ -519,7 +508,6 @@ static struct mdio_device_id __maybe_unused vitesse_tbl[] = { 
	{ PHY_ID_VSC8244, 0x000fffc0 },

	{ PHY_ID_VSC8514, 0x000ffff0 },

	{ PHY_ID_VSC8572, 0x000ffff0 },

	{ PHY_ID_VSC8574, 0x000ffff0 },

	{ PHY_ID_VSC7385, 0x000ffff0 },

	{ PHY_ID_VSC7388, 0x000ffff0 },

	{ PHY_ID_VSC7395, 0x000ffff0 },