tjh.dev / kernel
Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux
1
fork

Configure Feed

Select the types of activity you want to include in your feed.

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>

authored by

Manivannan Sadhasivam and committed by
Vinod Koul fcfcae3b 342ab21d

+11 -11
+11 -11
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
··· 99 99 [QPHY_PCS_POWER_DOWN_CONTROL] = QPHY_V5_PCS_UFS_POWER_DOWN_CONTROL, 100 100 }; 101 101 102 - static const struct qmp_phy_init_tbl msm8996_ufs_serdes[] = { 102 + static const struct qmp_phy_init_tbl msm8996_ufsphy_serdes[] = { 103 103 QMP_PHY_INIT_CFG(QSERDES_COM_CMN_CONFIG, 0x0e), 104 104 QMP_PHY_INIT_CFG(QSERDES_COM_SYSCLK_EN_SEL, 0xd7), 105 105 QMP_PHY_INIT_CFG(QSERDES_COM_CLK_SELECT, 0x30), ··· 148 148 QMP_PHY_INIT_CFG(QSERDES_COM_LOCK_CMP3_MODE1, 0x00), 149 149 }; 150 150 151 - static const struct qmp_phy_init_tbl msm8996_ufs_tx[] = { 151 + static const struct qmp_phy_init_tbl msm8996_ufsphy_tx[] = { 152 152 QMP_PHY_INIT_CFG(QSERDES_TX_HIGHZ_TRANSCEIVEREN_BIAS_DRVR_EN, 0x45), 153 153 QMP_PHY_INIT_CFG(QSERDES_TX_LANE_MODE, 0x02), 154 154 }; 155 155 156 - static const struct qmp_phy_init_tbl msm8996_ufs_rx[] = { 156 + static const struct qmp_phy_init_tbl msm8996_ufsphy_rx[] = { 157 157 QMP_PHY_INIT_CFG(QSERDES_RX_SIGDET_LVL, 0x24), 158 158 QMP_PHY_INIT_CFG(QSERDES_RX_SIGDET_CNTRL, 0x02), 159 159 QMP_PHY_INIT_CFG(QSERDES_RX_RX_INTERFACE_MODE, 0x00), ··· 634 634 .rx2 = 0xa00, 635 635 }; 636 636 637 - static const struct qmp_phy_cfg msm8996_ufs_cfg = { 637 + static const struct qmp_phy_cfg msm8996_ufsphy_cfg = { 638 638 .lanes = 1, 639 639 640 - .serdes_tbl = msm8996_ufs_serdes, 641 - .serdes_tbl_num = ARRAY_SIZE(msm8996_ufs_serdes), 642 - .tx_tbl = msm8996_ufs_tx, 643 - .tx_tbl_num = ARRAY_SIZE(msm8996_ufs_tx), 644 - .rx_tbl = msm8996_ufs_rx, 645 - .rx_tbl_num = ARRAY_SIZE(msm8996_ufs_rx), 640 + .serdes_tbl = msm8996_ufsphy_serdes, 641 + .serdes_tbl_num = ARRAY_SIZE(msm8996_ufsphy_serdes), 642 + .tx_tbl = msm8996_ufsphy_tx, 643 + .tx_tbl_num = ARRAY_SIZE(msm8996_ufsphy_tx), 644 + .rx_tbl = msm8996_ufsphy_rx, 645 + .rx_tbl_num = ARRAY_SIZE(msm8996_ufsphy_rx), 646 646 647 647 .clk_list = msm8996_ufs_phy_clk_l, 648 648 .num_clks = ARRAY_SIZE(msm8996_ufs_phy_clk_l), ··· 1220 1220 static const struct of_device_id qmp_ufs_of_match_table[] = { 1221 1221 { 1222 1222 .compatible = "qcom,msm8996-qmp-ufs-phy", 1223 - .data = &msm8996_ufs_cfg, 1223 + .data = &msm8996_ufsphy_cfg, 1224 1224 }, { 1225 1225 .compatible = "qcom,msm8998-qmp-ufs-phy", 1226 1226 .data = &sdm845_ufsphy_cfg,