Commit 2d3068cf authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

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



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: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Link: https://lore.kernel.org/r/20221017065013.19647-9-johan+linaro@kernel.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 2e52ddf0

drivers/phy/qualcomm/phy-qcom-qmp-ufs.c

+8 −14
Original line number Diff line number Diff line
@@ -89,22 +89,26 @@ enum qphy_reg_layout { 
static const unsigned int msm8996_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_START_CTRL]		= 0x00,

	[QPHY_PCS_READY_STATUS]		= 0x168,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int sdm845_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_START_CTRL]		= 0x00,

	[QPHY_PCS_READY_STATUS]		= 0x160,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int sm6115_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_START_CTRL]		= 0x00,

	[QPHY_PCS_READY_STATUS]		= 0x168,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int sm8150_ufsphy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_START_CTRL]		= QPHY_V4_PCS_UFS_PHY_START,

	[QPHY_PCS_READY_STATUS]		= QPHY_V4_PCS_UFS_READY_STATUS,

	[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[] = {
@@ -856,12 +860,7 @@ static int qmp_ufs_com_init(struct qmp_phy *qphy) 
	if (ret)

		goto err_disable_regulators;



	if (cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL])

		qphy_setbits(pcs,

			     cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],

			     cfg->pwrdn_ctrl);

	else

		qphy_setbits(pcs, QPHY_V2_PCS_POWER_DOWN_CONTROL,

	qphy_setbits(pcs, cfg->regs[QPHY_PCS_POWER_DOWN_CONTROL],

			cfg->pwrdn_ctrl);



	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);



	/* 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],

			cfg->pwrdn_ctrl);

	} else {

		qphy_clrbits(qphy->pcs, QPHY_V2_PCS_POWER_DOWN_CONTROL,

				cfg->pwrdn_ctrl);

	}



	return 0;

}