git.openwrt.org Git - openwrt/staging/stintel.git/blob

   1 From 02d3b306ac2f0b174753d1c5b9e4e5fb8ec5057e Mon Sep 17 00:00:00 2001
   2 From: Heiner Kallweit <hkallweit1@gmail.com>
   3 Date: Thu, 13 Feb 2025 20:19:14 +0100
   4 Subject: [PATCH] net: phy: realtek: switch from paged to MMD ops in rtl822x
   5  functions
   6
   7 The MDIO bus provided by r8169 for the internal PHY's now supports
   8 c45 ops for the MDIO_MMD_VEND2 device. So we can switch to standard
   9 MMD ops here.
  10
  11 Signed-off-by: Heiner Kallweit <hkallweit1@gmail.com>
  12 Reviewed-by: Andrew Lunn <andrew@lunn.ch>
  13 Link: https://patch.msgid.link/81416f95-0fac-4225-87b4-828e3738b8ed@gmail.com
  14 Signed-off-by: Jakub Kicinski <kuba@kernel.org>
  15 ---
  16  drivers/net/phy/realtek/realtek_main.c | 11 +++++------
  17  1 file changed, 5 insertions(+), 6 deletions(-)
  18
  19 --- a/drivers/net/phy/realtek/realtek_main.c
  20 +++ b/drivers/net/phy/realtek/realtek_main.c
  21 @@ -901,7 +901,7 @@ static int rtl822x_get_features(struct p
  22  {
  23         int val;
  24
  25 -       val = phy_read_paged(phydev, 0xa61, 0x13);
  26 +       val = phy_read_mmd(phydev, MDIO_MMD_VEND2, 0xa616);
  27         if (val < 0)
  28                 return val;
  29
  30 @@ -922,10 +922,9 @@ static int rtl822x_config_aneg(struct ph
  31         if (phydev->autoneg == AUTONEG_ENABLE) {
  32                 u16 adv = linkmode_adv_to_mii_10gbt_adv_t(phydev->advertising);
  33
  34 -               ret = phy_modify_paged_changed(phydev, 0xa5d, 0x12,
  35 -                                              MDIO_AN_10GBT_CTRL_ADV2_5G |
  36 -                                              MDIO_AN_10GBT_CTRL_ADV5G,
  37 -                                              adv);
  38 +               ret = phy_modify_mmd_changed(phydev, MDIO_MMD_VEND2, 0xa5d4,
  39 +                                            MDIO_AN_10GBT_CTRL_ADV2_5G |
  40 +                                            MDIO_AN_10GBT_CTRL_ADV5G, adv);
  41                 if (ret < 0)
  42                         return ret;
  43         }
  44 @@ -969,7 +968,7 @@ static int rtl822x_read_status(struct ph
  45             !phydev->autoneg_complete)
  46                 return 0;
  47
  48 -       lpadv = phy_read_paged(phydev, 0xa5d, 0x13);
  49 +       lpadv = phy_read_mmd(phydev, MDIO_MMD_VEND2, 0xa5d6);
  50         if (lpadv < 0)
  51                 return lpadv;
  52