phy: qcom-qmp-ufs: Rename MSM8996 PHY definitions

Only MSM8996 is using "_ufs_" naming convention for PHY definitions instead
of "_ufsphy_" as like other SoCs. So to maintain the uniformity, let's
rename all of the definitions to use "_ufsphy_".

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Tested-by: Andrew Halaney <ahalaney@redhat.com> # Qdrive3/sa8540p-ride
Signed-off-by: Manivannan Sadhasivam <manivannan.sadhasivam@linaro.org>
Link: https://lore.kernel.org/r/20230114071009.88102-3-manivannan.sadhasivam@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

diff --git a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
index 30d0987350401c1401a948ac74ff818945b193b1..5645637e77734ab7f9fc75f9aabdf1e28cdee775 100644 (file)
--- a/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
@@ -99,7 +99,7 @@ static const unsigned int ufsphy_v5_regs_layout[QPHY_LAYOUT_SIZE] = {
        [QPHY_PCS_POWER_DOWN_CONTROL]   = QPHY_V5_PCS_UFS_POWER_DOWN_CONTROL,
 };
 
-static const struct qmp_phy_init_tbl msm8996_ufs_serdes[] = {
+static const struct qmp_phy_init_tbl msm8996_ufsphy_serdes[] = {
        QMP_PHY_INIT_CFG(QSERDES_COM_CMN_CONFIG, 0x0e),
        QMP_PHY_INIT_CFG(QSERDES_COM_SYSCLK_EN_SEL, 0xd7),
        QMP_PHY_INIT_CFG(QSERDES_COM_CLK_SELECT, 0x30),
@@ -148,12 +148,12 @@ static const struct qmp_phy_init_tbl msm8996_ufs_serdes[] = {
        QMP_PHY_INIT_CFG(QSERDES_COM_LOCK_CMP3_MODE1, 0x00),
 };
 
-static const struct qmp_phy_init_tbl msm8996_ufs_tx[] = {
+static const struct qmp_phy_init_tbl msm8996_ufsphy_tx[] = {
        QMP_PHY_INIT_CFG(QSERDES_TX_HIGHZ_TRANSCEIVEREN_BIAS_DRVR_EN, 0x45),
        QMP_PHY_INIT_CFG(QSERDES_TX_LANE_MODE, 0x02),
 };
 
-static const struct qmp_phy_init_tbl msm8996_ufs_rx[] = {
+static const struct qmp_phy_init_tbl msm8996_ufsphy_rx[] = {
        QMP_PHY_INIT_CFG(QSERDES_RX_SIGDET_LVL, 0x24),
        QMP_PHY_INIT_CFG(QSERDES_RX_SIGDET_CNTRL, 0x02),
        QMP_PHY_INIT_CFG(QSERDES_RX_RX_INTERFACE_MODE, 0x00),
@@ -634,15 +634,15 @@ static const struct qmp_ufs_offsets qmp_ufs_offsets_v5 = {
        .rx2            = 0xa00,
 };
 
-static const struct qmp_phy_cfg msm8996_ufs_cfg = {
+static const struct qmp_phy_cfg msm8996_ufsphy_cfg = {
        .lanes                  = 1,
 
-       .serdes_tbl             = msm8996_ufs_serdes,
-       .serdes_tbl_num         = ARRAY_SIZE(msm8996_ufs_serdes),
-       .tx_tbl                 = msm8996_ufs_tx,
-       .tx_tbl_num             = ARRAY_SIZE(msm8996_ufs_tx),
-       .rx_tbl                 = msm8996_ufs_rx,
-       .rx_tbl_num             = ARRAY_SIZE(msm8996_ufs_rx),
+       .serdes_tbl             = msm8996_ufsphy_serdes,
+       .serdes_tbl_num         = ARRAY_SIZE(msm8996_ufsphy_serdes),
+       .tx_tbl                 = msm8996_ufsphy_tx,
+       .tx_tbl_num             = ARRAY_SIZE(msm8996_ufsphy_tx),
+       .rx_tbl                 = msm8996_ufsphy_rx,
+       .rx_tbl_num             = ARRAY_SIZE(msm8996_ufsphy_rx),
 
        .clk_list               = msm8996_ufs_phy_clk_l,
        .num_clks               = ARRAY_SIZE(msm8996_ufs_phy_clk_l),
@@ -1220,7 +1220,7 @@ err_node_put:
 static const struct of_device_id qmp_ufs_of_match_table[] = {
        {
                .compatible = "qcom,msm8996-qmp-ufs-phy",
-               .data = &msm8996_ufs_cfg,
+               .data = &msm8996_ufsphy_cfg,
        }, {
                .compatible = "qcom,msm8998-qmp-ufs-phy",
                .data = &sdm845_ufsphy_cfg,