summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKavya Sree Kotagiri <kavyasree.kotagiri@microchip.com>2019-04-22 07:52:04 -0400
committerDavid S. Miller <davem@davemloft.net>2019-04-23 13:47:58 -0400
commitedeb207b8a80ece2af89a444feb36539e3bc4ef8 (patch)
tree32406581a1e744b74e2c466661d577bf7fb5f128
parente4f9ba642f0b59a7ba3d34e7df7b82c732c31640 (diff)
net: phy: vitesse: Remove support for VSC8514.
Add support for VSC8514 in Microsemi driver (mscc.c) with more features. Signed-off-by: Kavya Sree Kotagiri <kavyasree.kotagiri@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/vitesse.c12
1 files changed, 0 insertions, 12 deletions
diff --git a/drivers/net/phy/vitesse.c b/drivers/net/phy/vitesse.c
index 48a881918885..43691b1acfd9 100644
--- a/drivers/net/phy/vitesse.c
+++ b/drivers/net/phy/vitesse.c
@@ -61,7 +61,6 @@
61 61
62#define PHY_ID_VSC8234 0x000fc620 62#define PHY_ID_VSC8234 0x000fc620
63#define PHY_ID_VSC8244 0x000fc6c0 63#define PHY_ID_VSC8244 0x000fc6c0
64#define PHY_ID_VSC8514 0x00070670
65#define PHY_ID_VSC8572 0x000704d0 64#define PHY_ID_VSC8572 0x000704d0
66#define PHY_ID_VSC8601 0x00070420 65#define PHY_ID_VSC8601 0x00070420
67#define PHY_ID_VSC7385 0x00070450 66#define PHY_ID_VSC7385 0x00070450
@@ -293,7 +292,6 @@ static int vsc82xx_config_intr(struct phy_device *phydev)
293 err = phy_write(phydev, MII_VSC8244_IMASK, 292 err = phy_write(phydev, MII_VSC8244_IMASK,
294 (phydev->drv->phy_id == PHY_ID_VSC8234 || 293 (phydev->drv->phy_id == PHY_ID_VSC8234 ||
295 phydev->drv->phy_id == PHY_ID_VSC8244 || 294 phydev->drv->phy_id == PHY_ID_VSC8244 ||
296 phydev->drv->phy_id == PHY_ID_VSC8514 ||
297 phydev->drv->phy_id == PHY_ID_VSC8572 || 295 phydev->drv->phy_id == PHY_ID_VSC8572 ||
298 phydev->drv->phy_id == PHY_ID_VSC8601) ? 296 phydev->drv->phy_id == PHY_ID_VSC8601) ?
299 MII_VSC8244_IMASK_MASK : 297 MII_VSC8244_IMASK_MASK :
@@ -404,15 +402,6 @@ static struct phy_driver vsc82xx_driver[] = {
404 .ack_interrupt = &vsc824x_ack_interrupt, 402 .ack_interrupt = &vsc824x_ack_interrupt,
405 .config_intr = &vsc82xx_config_intr, 403 .config_intr = &vsc82xx_config_intr,
406}, { 404}, {
407 .phy_id = PHY_ID_VSC8514,
408 .name = "Vitesse VSC8514",
409 .phy_id_mask = 0x000ffff0,
410 .features = PHY_GBIT_FEATURES,
411 .config_init = &vsc824x_config_init,
412 .config_aneg = &vsc82x4_config_aneg,
413 .ack_interrupt = &vsc824x_ack_interrupt,
414 .config_intr = &vsc82xx_config_intr,
415}, {
416 .phy_id = PHY_ID_VSC8572, 405 .phy_id = PHY_ID_VSC8572,
417 .name = "Vitesse VSC8572", 406 .name = "Vitesse VSC8572",
418 .phy_id_mask = 0x000ffff0, 407 .phy_id_mask = 0x000ffff0,
@@ -499,7 +488,6 @@ module_phy_driver(vsc82xx_driver);
499static struct mdio_device_id __maybe_unused vitesse_tbl[] = { 488static struct mdio_device_id __maybe_unused vitesse_tbl[] = {
500 { PHY_ID_VSC8234, 0x000ffff0 }, 489 { PHY_ID_VSC8234, 0x000ffff0 },
501 { PHY_ID_VSC8244, 0x000fffc0 }, 490 { PHY_ID_VSC8244, 0x000fffc0 },
502 { PHY_ID_VSC8514, 0x000ffff0 },
503 { PHY_ID_VSC8572, 0x000ffff0 }, 491 { PHY_ID_VSC8572, 0x000ffff0 },
504 { PHY_ID_VSC7385, 0x000ffff0 }, 492 { PHY_ID_VSC7385, 0x000ffff0 },
505 { PHY_ID_VSC7388, 0x000ffff0 }, 493 { PHY_ID_VSC7388, 0x000ffff0 },