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

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: Quentin Schulz <quentin.schulz@bootlin.com>
Signed-off-by: David S. Miller <davem@davemloft.net>

authored by

Quentin Schulz and committed by
David S. Miller
21f49468 0cb98e84

-12
-12
drivers/net/phy/vitesse.c
··· 70 70 #define PHY_ID_VSC8244 0x000fc6c0 71 71 #define PHY_ID_VSC8514 0x00070670 72 72 #define PHY_ID_VSC8572 0x000704d0 73 - #define PHY_ID_VSC8574 0x000704a0 74 73 #define PHY_ID_VSC8601 0x00070420 75 74 #define PHY_ID_VSC7385 0x00070450 76 75 #define PHY_ID_VSC7388 0x00070480 ··· 302 303 phydev->drv->phy_id == PHY_ID_VSC8244 || 303 304 phydev->drv->phy_id == PHY_ID_VSC8514 || 304 305 phydev->drv->phy_id == PHY_ID_VSC8572 || 305 - phydev->drv->phy_id == PHY_ID_VSC8574 || 306 306 phydev->drv->phy_id == PHY_ID_VSC8601) ? 307 307 MII_VSC8244_IMASK_MASK : 308 308 MII_VSC8221_IMASK_MASK); ··· 429 431 .ack_interrupt = &vsc824x_ack_interrupt, 430 432 .config_intr = &vsc82xx_config_intr, 431 433 }, { 432 - .phy_id = PHY_ID_VSC8574, 433 - .name = "Vitesse VSC8574", 434 - .phy_id_mask = 0x000ffff0, 435 - .features = PHY_GBIT_FEATURES, 436 - .config_init = &vsc824x_config_init, 437 - .config_aneg = &vsc82x4_config_aneg, 438 - .ack_interrupt = &vsc824x_ack_interrupt, 439 - .config_intr = &vsc82xx_config_intr, 440 - }, { 441 434 .phy_id = PHY_ID_VSC8601, 442 435 .name = "Vitesse VSC8601", 443 436 .phy_id_mask = 0x000ffff0, ··· 508 519 { PHY_ID_VSC8244, 0x000fffc0 }, 509 520 { PHY_ID_VSC8514, 0x000ffff0 }, 510 521 { PHY_ID_VSC8572, 0x000ffff0 }, 511 - { PHY_ID_VSC8574, 0x000ffff0 }, 512 522 { PHY_ID_VSC7385, 0x000ffff0 }, 513 523 { PHY_ID_VSC7388, 0x000ffff0 }, 514 524 { PHY_ID_VSC7395, 0x000ffff0 },