net: phy: Rename Airoha common BuckPBus register accessors

Rename the BuckPBus register accessors functions present in air_phy_lib
and their calls in air_en8811h driver, so all exported functions start
with the same prefix.

Reviewed-by: Andrew Lunn <andrew@lunn.ch>
Signed-off-by: Louis-Alexis Eyraud <louisalexis.eyraud@collabora.com>
Link: https://patch.msgid.link/20260526-add-airoha-an8801-support-v5-4-01aea8dee69b@collabora.com
Signed-off-by: Jakub Kicinski <kuba@kernel.org>

diff --git a/drivers/net/phy/air_en8811h.c b/drivers/net/phy/air_en8811h.c
index 2498bd3f799346e4325b6124bf8cfe059726b9c4..a42898ae41358fe86072a55528a0ecff0eb5ec19 100644 (file)
--- a/drivers/net/phy/air_en8811h.c
+++ b/drivers/net/phy/air_en8811h.c
@@ -287,8 +287,8 @@ static int en8811h_wait_mcu_ready(struct phy_device *phydev)
 {
        int ret, reg_value;
 
-       ret = air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
-                                    EN8811H_FW_CTRL_1_FINISH);
+       ret = air_phy_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
+                                        EN8811H_FW_CTRL_1_FINISH);
        if (ret)
                return ret;
 
@@ -313,28 +313,29 @@ static int an8811hb_check_crc(struct phy_device *phydev, u32 set1,
        int ret;
 
        /* Configure CRC */
-       ret = air_buckpbus_reg_modify(phydev, set1,
-                                     AN8811HB_CRC_RD_EN,
-                                     AN8811HB_CRC_RD_EN);
+       ret = air_phy_buckpbus_reg_modify(phydev, set1,
+                                         AN8811HB_CRC_RD_EN,
+                                         AN8811HB_CRC_RD_EN);
        if (ret < 0)
                return ret;
-       air_buckpbus_reg_read(phydev, set1, &pbus_value);
+       air_phy_buckpbus_reg_read(phydev, set1, &pbus_value);
 
        do {
                msleep(300);
-               air_buckpbus_reg_read(phydev, mon2, &pbus_value);
+               air_phy_buckpbus_reg_read(phydev, mon2, &pbus_value);
 
                /* We do not know what errors this check is supposed
                 * catch or what to do about a failure. So print the
                 * result and continue like the vendor driver does.
                 */
                if (pbus_value & AN8811HB_CRC_ST) {
-                       air_buckpbus_reg_read(phydev, mon3, &pbus_value);
+                       air_phy_buckpbus_reg_read(phydev, mon3, &pbus_value);
                        phydev_dbg(phydev, "CRC Check %s!\n",
                                   pbus_value & AN8811HB_CRC_CHECK_PASS ?
                                        "PASS" : "FAIL");
-                       return air_buckpbus_reg_modify(phydev, set1,
-                                                      AN8811HB_CRC_RD_EN, 0);
+                       return air_phy_buckpbus_reg_modify(phydev, set1,
+                                                          AN8811HB_CRC_RD_EN,
+                                                          0);
                }
        } while (--retry);
 
@@ -346,8 +347,8 @@ static void en8811h_print_fw_version(struct phy_device *phydev)
 {
        struct en8811h_priv *priv = phydev->priv;
 
-       air_buckpbus_reg_read(phydev, EN8811H_FW_VERSION,
-                             &priv->firmware_version);
+       air_phy_buckpbus_reg_read(phydev, EN8811H_FW_VERSION,
+                                 &priv->firmware_version);
        phydev_info(phydev, "MD32 firmware version: %08x\n",
                    priv->firmware_version);
 }
@@ -372,8 +373,8 @@ static int an8811hb_load_firmware(struct phy_device *phydev)
 {
        int ret;
 
-       ret = air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
-                                    EN8811H_FW_CTRL_1_START);
+       ret = air_phy_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
+                                        EN8811H_FW_CTRL_1_START);
        if (ret < 0)
                return ret;
 
@@ -414,14 +415,14 @@ static int en8811h_load_firmware(struct phy_device *phydev)
        if (ret < 0)
                goto en8811h_load_firmware_rel1;
 
-       ret = air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
-                                    EN8811H_FW_CTRL_1_START);
+       ret = air_phy_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
+                                        EN8811H_FW_CTRL_1_START);
        if (ret < 0)
                goto en8811h_load_firmware_out;
 
-       ret = air_buckpbus_reg_modify(phydev, EN8811H_FW_CTRL_2,
-                                     EN8811H_FW_CTRL_2_LOADING,
-                                     EN8811H_FW_CTRL_2_LOADING);
+       ret = air_phy_buckpbus_reg_modify(phydev, EN8811H_FW_CTRL_2,
+                                         EN8811H_FW_CTRL_2_LOADING,
+                                         EN8811H_FW_CTRL_2_LOADING);
        if (ret < 0)
                goto en8811h_load_firmware_out;
 
@@ -433,8 +434,8 @@ static int en8811h_load_firmware(struct phy_device *phydev)
        if (ret < 0)
                goto en8811h_load_firmware_out;
 
-       ret = air_buckpbus_reg_modify(phydev, EN8811H_FW_CTRL_2,
-                                     EN8811H_FW_CTRL_2_LOADING, 0);
+       ret = air_phy_buckpbus_reg_modify(phydev, EN8811H_FW_CTRL_2,
+                                         EN8811H_FW_CTRL_2_LOADING, 0);
        if (ret < 0)
                goto en8811h_load_firmware_out;
 
@@ -460,8 +461,8 @@ static int en8811h_restart_mcu(struct phy_device *phydev)
 {
        int ret;
 
-       ret = air_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
-                                    EN8811H_FW_CTRL_1_START);
+       ret = air_phy_buckpbus_reg_write(phydev, EN8811H_FW_CTRL_1,
+                                        EN8811H_FW_CTRL_1_START);
        if (ret < 0)
                return ret;
 
@@ -755,7 +756,7 @@ static unsigned long an8811hb_clk_recalc_rate(struct clk_hw *hw,
        u32 pbus_value;
        int ret;
 
-       ret = air_buckpbus_reg_read(phydev, AN8811HB_HWTRAP2, &pbus_value);
+       ret = air_phy_buckpbus_reg_read(phydev, AN8811HB_HWTRAP2, &pbus_value);
        if (ret < 0)
                return ret;
 
@@ -767,9 +768,9 @@ static int an8811hb_clk_enable(struct clk_hw *hw)
        struct en8811h_priv *priv = clk_hw_to_en8811h_priv(hw);
        struct phy_device *phydev = priv->phydev;
 
-       return air_buckpbus_reg_modify(phydev, AN8811HB_CLK_DRV,
-                                      AN8811HB_CLK_DRV_CKO_MASK,
-                                      AN8811HB_CLK_DRV_CKO_MASK);
+       return air_phy_buckpbus_reg_modify(phydev, AN8811HB_CLK_DRV,
+                                          AN8811HB_CLK_DRV_CKO_MASK,
+                                          AN8811HB_CLK_DRV_CKO_MASK);
 }
 
 static void an8811hb_clk_disable(struct clk_hw *hw)
@@ -777,8 +778,8 @@ static void an8811hb_clk_disable(struct clk_hw *hw)
        struct en8811h_priv *priv = clk_hw_to_en8811h_priv(hw);
        struct phy_device *phydev = priv->phydev;
 
-       air_buckpbus_reg_modify(phydev, AN8811HB_CLK_DRV,
-                               AN8811HB_CLK_DRV_CKO_MASK, 0);
+       air_phy_buckpbus_reg_modify(phydev, AN8811HB_CLK_DRV,
+                                   AN8811HB_CLK_DRV_CKO_MASK, 0);
 }
 
 static int an8811hb_clk_is_enabled(struct clk_hw *hw)
@@ -788,7 +789,7 @@ static int an8811hb_clk_is_enabled(struct clk_hw *hw)
        u32 pbus_value;
        int ret;
 
-       ret = air_buckpbus_reg_read(phydev, AN8811HB_CLK_DRV, &pbus_value);
+       ret = air_phy_buckpbus_reg_read(phydev, AN8811HB_CLK_DRV, &pbus_value);
        if (ret < 0)
                return ret;
 
@@ -854,7 +855,7 @@ static unsigned long en8811h_clk_recalc_rate(struct clk_hw *hw,
        u32 pbus_value;
        int ret;
 
-       ret = air_buckpbus_reg_read(phydev, EN8811H_HWTRAP1, &pbus_value);
+       ret = air_phy_buckpbus_reg_read(phydev, EN8811H_HWTRAP1, &pbus_value);
        if (ret < 0)
                return ret;
 
@@ -866,9 +867,9 @@ static int en8811h_clk_enable(struct clk_hw *hw)
        struct en8811h_priv *priv = clk_hw_to_en8811h_priv(hw);
        struct phy_device *phydev = priv->phydev;
 
-       return air_buckpbus_reg_modify(phydev, EN8811H_CLK_CGM,
-                                      EN8811H_CLK_CGM_CKO,
-                                      EN8811H_CLK_CGM_CKO);
+       return air_phy_buckpbus_reg_modify(phydev, EN8811H_CLK_CGM,
+                                          EN8811H_CLK_CGM_CKO,
+                                          EN8811H_CLK_CGM_CKO);
 }
 
 static void en8811h_clk_disable(struct clk_hw *hw)
@@ -876,8 +877,8 @@ static void en8811h_clk_disable(struct clk_hw *hw)
        struct en8811h_priv *priv = clk_hw_to_en8811h_priv(hw);
        struct phy_device *phydev = priv->phydev;
 
-       air_buckpbus_reg_modify(phydev, EN8811H_CLK_CGM,
-                               EN8811H_CLK_CGM_CKO, 0);
+       air_phy_buckpbus_reg_modify(phydev, EN8811H_CLK_CGM,
+                                   EN8811H_CLK_CGM_CKO, 0);
 }
 
 static int en8811h_clk_is_enabled(struct clk_hw *hw)
@@ -887,7 +888,7 @@ static int en8811h_clk_is_enabled(struct clk_hw *hw)
        u32 pbus_value;
        int ret;
 
-       ret = air_buckpbus_reg_read(phydev, EN8811H_CLK_CGM, &pbus_value);
+       ret = air_phy_buckpbus_reg_read(phydev, EN8811H_CLK_CGM, &pbus_value);
        if (ret < 0)
                return ret;
 
@@ -998,9 +999,9 @@ static int an8811hb_probe(struct phy_device *phydev)
                return ret;
 
        /* Configure led gpio pins as output */
-       ret = air_buckpbus_reg_modify(phydev, AN8811HB_GPIO_OUTPUT,
-                                     AN8811HB_GPIO_OUTPUT_345,
-                                     AN8811HB_GPIO_OUTPUT_345);
+       ret = air_phy_buckpbus_reg_modify(phydev, AN8811HB_GPIO_OUTPUT,
+                                         AN8811HB_GPIO_OUTPUT_345,
+                                         AN8811HB_GPIO_OUTPUT_345);
        if (ret < 0)
                return ret;
 
@@ -1039,9 +1040,9 @@ static int en8811h_probe(struct phy_device *phydev)
                return ret;
 
        /* Configure led gpio pins as output */
-       ret = air_buckpbus_reg_modify(phydev, EN8811H_GPIO_OUTPUT,
-                                     EN8811H_GPIO_OUTPUT_345,
-                                     EN8811H_GPIO_OUTPUT_345);
+       ret = air_phy_buckpbus_reg_modify(phydev, EN8811H_GPIO_OUTPUT,
+                                         EN8811H_GPIO_OUTPUT_345,
+                                         EN8811H_GPIO_OUTPUT_345);
        if (ret < 0)
                return ret;
 
@@ -1061,9 +1062,9 @@ static int an8811hb_config_serdes_polarity(struct phy_device *phydev)
                return ret;
        if (pol == PHY_POL_NORMAL)
                pbus_value |= AN8811HB_RX_POLARITY_NORMAL;
-       ret = air_buckpbus_reg_modify(phydev, AN8811HB_RX_POLARITY,
-                                     AN8811HB_RX_POLARITY_NORMAL,
-                                     pbus_value);
+       ret = air_phy_buckpbus_reg_modify(phydev, AN8811HB_RX_POLARITY,
+                                         AN8811HB_RX_POLARITY_NORMAL,
+                                         pbus_value);
        if (ret < 0)
                return ret;
 
@@ -1074,9 +1075,9 @@ static int an8811hb_config_serdes_polarity(struct phy_device *phydev)
        pbus_value = 0;
        if (pol == PHY_POL_NORMAL)
                pbus_value |= AN8811HB_TX_POLARITY_NORMAL;
-       return air_buckpbus_reg_modify(phydev, AN8811HB_TX_POLARITY,
-                                      AN8811HB_TX_POLARITY_NORMAL,
-                                      pbus_value);
+       return air_phy_buckpbus_reg_modify(phydev, AN8811HB_TX_POLARITY,
+                                          AN8811HB_TX_POLARITY_NORMAL,
+                                          pbus_value);
 }
 
 static int en8811h_config_serdes_polarity(struct phy_device *phydev)
@@ -1110,9 +1111,10 @@ static int en8811h_config_serdes_polarity(struct phy_device *phydev)
        if (pol == PHY_POL_NORMAL)
                pbus_value |= EN8811H_POLARITY_TX_NORMAL;
 
-       return air_buckpbus_reg_modify(phydev, EN8811H_POLARITY,
-                                      EN8811H_POLARITY_RX_REVERSE |
-                                      EN8811H_POLARITY_TX_NORMAL, pbus_value);
+       return air_phy_buckpbus_reg_modify(phydev, EN8811H_POLARITY,
+                                          EN8811H_POLARITY_RX_REVERSE |
+                                          EN8811H_POLARITY_TX_NORMAL,
+                                          pbus_value);
 }
 
 static int an8811hb_config_init(struct phy_device *phydev)
@@ -1264,8 +1266,8 @@ static int en8811h_read_status(struct phy_device *phydev)
                                 val & MDIO_AN_10GBT_STAT_LP2_5G);
        } else {
                /* Get link partner 2.5GBASE-T ability from vendor register */
-               ret = air_buckpbus_reg_read(phydev, EN8811H_2P5G_LPA,
-                                           &pbus_value);
+               ret = air_phy_buckpbus_reg_read(phydev, EN8811H_2P5G_LPA,
+                                               &pbus_value);
                if (ret < 0)
                        return ret;
                linkmode_mod_bit(ETHTOOL_LINK_MODE_2500baseT_Full_BIT,

diff --git a/drivers/net/phy/air_phy_lib.c b/drivers/net/phy/air_phy_lib.c
index aba4f95fe9e66ec82db025617e7ab741fdaa5e9a..859fa41406d1c2a3902eee94ebeac71d3e5540fb 100644 (file)
--- a/drivers/net/phy/air_phy_lib.c
+++ b/drivers/net/phy/air_phy_lib.c
@@ -137,8 +137,8 @@ static int __air_buckpbus_reg_modify(struct phy_device *phydev,
        return 0;
 }
 
-int air_buckpbus_reg_read(struct phy_device *phydev, u32 pbus_address,
-                         u32 *pbus_data)
+int air_phy_buckpbus_reg_read(struct phy_device *phydev, u32 pbus_address,
+                             u32 *pbus_data)
 {
        int saved_page;
        int ret = 0;
@@ -154,10 +154,10 @@ int air_buckpbus_reg_read(struct phy_device *phydev, u32 pbus_address,
 
        return phy_restore_page(phydev, saved_page, ret);
 }
-EXPORT_SYMBOL_GPL(air_buckpbus_reg_read);
+EXPORT_SYMBOL_GPL(air_phy_buckpbus_reg_read);
 
-int air_buckpbus_reg_write(struct phy_device *phydev, u32 pbus_address,
-                          u32 pbus_data)
+int air_phy_buckpbus_reg_write(struct phy_device *phydev, u32 pbus_address,
+                              u32 pbus_data)
 {
        int saved_page;
        int ret = 0;
@@ -174,10 +174,10 @@ int air_buckpbus_reg_write(struct phy_device *phydev, u32 pbus_address,
 
        return phy_restore_page(phydev, saved_page, ret);
 }
-EXPORT_SYMBOL_GPL(air_buckpbus_reg_write);
+EXPORT_SYMBOL_GPL(air_phy_buckpbus_reg_write);
 
-int air_buckpbus_reg_modify(struct phy_device *phydev, u32 pbus_address,
-                           u32 mask, u32 set)
+int air_phy_buckpbus_reg_modify(struct phy_device *phydev, u32 pbus_address,
+                               u32 mask, u32 set)
 {
        int saved_page;
        int ret = 0;
@@ -194,7 +194,7 @@ int air_buckpbus_reg_modify(struct phy_device *phydev, u32 pbus_address,
 
        return phy_restore_page(phydev, saved_page, ret);
 }
-EXPORT_SYMBOL_GPL(air_buckpbus_reg_modify);
+EXPORT_SYMBOL_GPL(air_phy_buckpbus_reg_modify);
 
 int air_phy_read_page(struct phy_device *phydev)
 {

diff --git a/drivers/net/phy/air_phy_lib.h b/drivers/net/phy/air_phy_lib.h
index b637f3e0f2d55c26447f217da30102ff55881543..a2f8b3725761a68902259fe088f47c2d37e58619 100644 (file)
--- a/drivers/net/phy/air_phy_lib.h
+++ b/drivers/net/phy/air_phy_lib.h
@@ -27,12 +27,12 @@
 #define AIR_BPBUS_RD_DATA_HIGH         0x17
 #define AIR_BPBUS_RD_DATA_LOW          0x18
 
-int air_buckpbus_reg_modify(struct phy_device *phydev, u32 pbus_address,
-                           u32 mask, u32 set);
-int air_buckpbus_reg_read(struct phy_device *phydev, u32 pbus_address,
-                         u32 *pbus_data);
-int air_buckpbus_reg_write(struct phy_device *phydev, u32 pbus_address,
-                          u32 pbus_data);
+int air_phy_buckpbus_reg_modify(struct phy_device *phydev, u32 pbus_address,
+                               u32 mask, u32 set);
+int air_phy_buckpbus_reg_read(struct phy_device *phydev, u32 pbus_address,
+                             u32 *pbus_data);
+int air_phy_buckpbus_reg_write(struct phy_device *phydev, u32 pbus_address,
+                              u32 pbus_data);
 int air_phy_read_page(struct phy_device *phydev);
 int air_phy_write_page(struct phy_device *phydev, int page);