iv/linux
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

phy: qcom-qmp-ufs: clean up power-down handling

Browse Source 
Always define the POWER_DOWN_CONTROL register instead of falling back to
the v2 (and v4) offset during power on and power off.

Reviewed-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: Johan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221017065013.19647-9-johan+linaro@kernel.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>
This commit is contained in:
Johan Hovold
2022-10-17 08:50:10 +02:00
committed by Vinod Koul
parent 2e52ddf045
commit 2d3068cf8d
1 changed files with 8 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

22
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
View File

@ -89,22 +89,26 @@ enum qphy_reg_layout {
static const unsigned int msm8996_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = { static const unsigned int msm8996_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = 0x00, [QPHY_START_CTRL] = 0x00,
[QPHY_PCS_READY_STATUS] = 0x168, [QPHY_PCS_READY_STATUS] = 0x168,
[QPHY_PCS_POWER_DOWN_CONTROL] = 0x04,
}; };
static const unsigned int sdm845_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = { static const unsigned int sdm845_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = 0x00, [QPHY_START_CTRL] = 0x00,
[QPHY_PCS_READY_STATUS] = 0x160, [QPHY_PCS_READY_STATUS] = 0x160,
[QPHY_PCS_POWER_DOWN_CONTROL] = 0x04,
}; };
static const unsigned int sm6115_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = { static const unsigned int sm6115_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = 0x00, [QPHY_START_CTRL] = 0x00,
[QPHY_PCS_READY_STATUS] = 0x168, [QPHY_PCS_READY_STATUS] = 0x168,
[QPHY_PCS_POWER_DOWN_CONTROL] = 0x04,
}; };
static const unsigned int sm8150_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = { static const unsigned int sm8150_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {
[QPHY_START_CTRL] = QPHY_V4_PCS_UFS_PHY_START, [QPHY_START_CTRL] = QPHY_V4_PCS_UFS_PHY_START,
[QPHY_PCS_READY_STATUS] = QPHY_V4_PCS_UFS_READY_STATUS, [QPHY_PCS_READY_STATUS] = QPHY_V4_PCS_UFS_READY_STATUS,
[QPHY_SW_RESET] = QPHY_V4_PCS_UFS_SW_RESET, [QPHY_SW_RESET] = QPHY_V4_PCS_UFS_SW_RESET,
[QPHY_PCS_POWER_DOWN_CONTROL] = QPHY_V4_PCS_UFS_POWER_DOWN_CONTROL,
}; };
static const struct qmp_phy_init_tbl msm8996_ufs_serdes_tbl[] = { static const struct qmp_phy_init_tbl msm8996_ufs_serdes_tbl[] = {
@ -856,13 +860,8 @@ static int qmp_ufs_com_init(struct qmp_phy *qphy)
if (ret) if (ret)
goto err_disable_regulators; goto err_disable_regulators;
if (cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL]) qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],
qphy_setbits(pcs, cfg->pwrdn_ctrl);
cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],
cfg->pwrdn_ctrl);
else
qphy_setbits(pcs, QPHY_V2_PCS_POWER_DOWN_CONTROL,
cfg->pwrdn_ctrl);
return 0; return 0;
@ -996,13 +995,8 @@ static int qmp_ufs_power_off(struct phy *phy)
qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl); qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
/* Put PHY into POWER DOWN state: active low */ /* Put PHY into POWER DOWN state: active low */
if (cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL]) { qphy_clrbits(qphy->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],
qphy_clrbits(qphy->pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL], cfg->pwrdn_ctrl);
cfg->pwrdn_ctrl);
} else {
qphy_clrbits(qphy->pcs, QPHY_V2_PCS_POWER_DOWN_CONTROL,
cfg->pwrdn_ctrl);
}
return 0; return 0;
} }