Commit 6d5b1e20 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

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



Always define the POWER_DOWN_CONTROL register instead of falling back to
the v2 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-5-johan+linaro@kernel.org


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

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

+7 −14
Original line number Diff line number Diff line
@@ -98,18 +98,21 @@ static const unsigned int pciephy_regs_layout[QPHY_LAYOUT_SIZE] = { 
	[QPHY_SW_RESET]			= 0x00,

	[QPHY_START_CTRL]		= 0x08,

	[QPHY_PCS_STATUS]		= 0x174,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int sdm845_qmp_pciephy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_SW_RESET]			= 0x00,

	[QPHY_START_CTRL]		= 0x08,

	[QPHY_PCS_STATUS]		= 0x174,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int sdm845_qhp_pciephy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_SW_RESET]			= 0x00,

	[QPHY_START_CTRL]		= 0x08,

	[QPHY_PCS_STATUS]		= 0x2ac,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int sm8250_pcie_regs_layout[QPHY_LAYOUT_SIZE] = {
@@ -1999,12 +2002,7 @@ static int qmp_pcie_init(struct phy *phy) 
	if (ret)

		goto err_assert_reset;



	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;
@@ -2112,13 +2110,8 @@ static int qmp_pcie_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;

}