summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMarek Vasut <marex@denx.de>2019-10-16 09:35:07 -0400
committerDavid S. Miller <davem@davemloft.net>2019-10-17 19:31:52 -0400
commit1d951ba3da67bbc7a9b0e05987e09552c2060e18 (patch)
tree9fecfa45b62b4cf672d58f15b68ad9235b0c5592
parent8b95599c55ed24b36cf44a4720067cfe67edbcb4 (diff)
net: phy: micrel: Update KSZ87xx PHY name
The KSZ8795 PHY ID is in fact used by KSZ8794/KSZ8795/KSZ8765 switches. Update the PHY ID and name to reflect that, as this family of switches is commonly refered to as KSZ87xx Signed-off-by: Marek Vasut <marex@denx.de> Cc: Andrew Lunn <andrew@lunn.ch> Cc: David S. Miller <davem@davemloft.net> Cc: Florian Fainelli <f.fainelli@gmail.com> Cc: George McCollister <george.mccollister@gmail.com> Cc: Heiner Kallweit <hkallweit1@gmail.com> Cc: Sean Nyekjaer <sean.nyekjaer@prevas.dk> Cc: Tristram Ha <Tristram.Ha@microchip.com> Cc: Woojung Huh <woojung.huh@microchip.com> Signed-off-by: David S. Miller <davem@davemloft.net>
-rw-r--r--drivers/net/phy/micrel.c4
-rw-r--r--include/linux/micrel_phy.h2
2 files changed, 3 insertions, 3 deletions
diff --git a/drivers/net/phy/micrel.c b/drivers/net/phy/micrel.c
index a0444e28c6e7..63dedec0433d 100644
--- a/drivers/net/phy/micrel.c
+++ b/drivers/net/phy/micrel.c
@@ -395,7 +395,7 @@ static int ksz8061_config_init(struct phy_device *phydev)
395 395
396static int ksz8795_match_phy_device(struct phy_device *phydev) 396static int ksz8795_match_phy_device(struct phy_device *phydev)
397{ 397{
398 return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ8795); 398 return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ87XX);
399} 399}
400 400
401static int ksz9021_load_values_from_of(struct phy_device *phydev, 401static int ksz9021_load_values_from_of(struct phy_device *phydev,
@@ -1174,7 +1174,7 @@ static struct phy_driver ksphy_driver[] = {
1174 .suspend = genphy_suspend, 1174 .suspend = genphy_suspend,
1175 .resume = genphy_resume, 1175 .resume = genphy_resume,
1176}, { 1176}, {
1177 .name = "Micrel KSZ8795", 1177 .name = "Micrel KSZ87XX Switch",
1178 /* PHY_BASIC_FEATURES */ 1178 /* PHY_BASIC_FEATURES */
1179 .config_init = kszphy_config_init, 1179 .config_init = kszphy_config_init,
1180 .config_aneg = ksz8873mll_config_aneg, 1180 .config_aneg = ksz8873mll_config_aneg,
diff --git a/include/linux/micrel_phy.h b/include/linux/micrel_phy.h
index ad24554f11f9..75f880c25bb8 100644
--- a/include/linux/micrel_phy.h
+++ b/include/linux/micrel_phy.h
@@ -31,7 +31,7 @@
31#define PHY_ID_KSZ886X 0x00221430 31#define PHY_ID_KSZ886X 0x00221430
32#define PHY_ID_KSZ8863 0x00221435 32#define PHY_ID_KSZ8863 0x00221435
33 33
34#define PHY_ID_KSZ8795 0x00221550 34#define PHY_ID_KSZ87XX 0x00221550
35 35
36#define PHY_ID_KSZ9477 0x00221631 36#define PHY_ID_KSZ9477 0x00221631
37 37