| From 58bfbb512504298bcaac1c971377a9d887a56f4f Mon Sep 17 00:00:00 2001 |
| From: Marek Vasut <marex@denx.de> |
| Date: Wed, 16 Oct 2019 15:35:07 +0200 |
| Subject: [PATCH] net: phy: micrel: Update KSZ87xx PHY name |
| |
| commit 1d951ba3da67bbc7a9b0e05987e09552c2060e18 upstream. |
| |
| 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> |
| Signed-off-by: Paul Gortmaker <paul.gortmaker@windriver.com> |
| |
| 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) |
| |
| static int ksz8795_match_phy_device(struct phy_device *phydev) |
| { |
| - return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ8795); |
| + return ksz8051_ksz8795_match_phy_device(phydev, PHY_ID_KSZ87XX); |
| } |
| |
| static int ksz9021_load_values_from_of(struct phy_device *phydev, |
| @@ -1174,7 +1174,7 @@ static struct phy_driver ksphy_driver[] = { |
| .suspend = genphy_suspend, |
| .resume = genphy_resume, |
| }, { |
| - .name = "Micrel KSZ8795", |
| + .name = "Micrel KSZ87XX Switch", |
| /* PHY_BASIC_FEATURES */ |
| .config_init = kszphy_config_init, |
| .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 @@ |
| #define PHY_ID_KSZ886X 0x00221430 |
| #define PHY_ID_KSZ8863 0x00221435 |
| |
| -#define PHY_ID_KSZ8795 0x00221550 |
| +#define PHY_ID_KSZ87XX 0x00221550 |
| |
| #define PHY_ID_KSZ9477 0x00221631 |
| |
| -- |
| 2.7.4 |
| |
