Commit 645d3d04 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

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



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


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

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

+6 −14
Original line number Diff line number Diff line
@@ -126,6 +126,7 @@ static const unsigned int usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = { 
	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= 0x0d4,

	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR]  = 0x0d8,

	[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x178,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int qmp_v3_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
@@ -135,6 +136,7 @@ static const unsigned int qmp_v3_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = { 
	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= 0x0d8,

	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR]  = 0x0dc,

	[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= 0x04,

};



static const unsigned int qmp_v4_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {
@@ -2164,12 +2166,7 @@ static int qmp_usb_init(struct phy *phy) 
		qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_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;
@@ -2277,13 +2274,8 @@ static int qmp_usb_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;

}