Commit 14d98d3b authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Vinod Koul
Browse files

phy: qcom-qmp-usb: fix regs layout arrays 



Drop qcm2290_usb3phy_regs_layout, it is a duplicate of
qmp_v3_usb3phy_regs_layout. Introduce qmp_v5_usb3phy_regs_layout to be
used for sm8350 and sc8280xp.

Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20221110192248.873973-13-dmitry.baryshkov@linaro.org


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

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

+13 −11
Original line number Diff line number Diff line
@@ -125,13 +125,15 @@ static const unsigned int qmp_v4_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = { 
	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V4_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR,

};



static const unsigned int qcm2290_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_SW_RESET]			= QPHY_V3_PCS_SW_RESET,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= QPHY_V3_PCS_POWER_DOWN_CONTROL,

	[QPHY_START_CTRL]		= QPHY_V3_PCS_START_CONTROL,

	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= QPHY_V3_PCS_AUTONOMOUS_MODE_CTRL,

	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V3_PCS_LFPS_RXTERM_IRQ_CLEAR,

	[QPHY_PCS_STATUS]		= QPHY_V3_PCS_PCS_STATUS,

static const unsigned int qmp_v5_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = {

	[QPHY_SW_RESET]			= QPHY_V5_PCS_SW_RESET,

	[QPHY_START_CTRL]		= QPHY_V5_PCS_START_CONTROL,

	[QPHY_PCS_STATUS]		= QPHY_V5_PCS_PCS_STATUS1,

	[QPHY_PCS_POWER_DOWN_CONTROL]	= QPHY_V5_PCS_POWER_DOWN_CONTROL,



	/* In PCS_USB */

	[QPHY_PCS_AUTONOMOUS_MODE_CTRL]	= QPHY_V5_PCS_USB3_AUTONOMOUS_MODE_CTRL,

	[QPHY_PCS_LFPS_RXTERM_IRQ_CLEAR] = QPHY_V5_PCS_USB3_LFPS_RXTERM_IRQ_CLEAR,

};



static const struct qmp_phy_init_tbl ipq8074_usb3_serdes_tbl[] = {
@@ -1666,7 +1668,7 @@ static const struct qmp_phy_cfg sc8280xp_usb3_uniphy_cfg = { 
	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v4_usb3phy_regs_layout,

	.regs			= qmp_v5_usb3phy_regs_layout,

};



static const struct qmp_phy_cfg qmp_v3_usb3_uniphy_cfg = {
@@ -1882,7 +1884,7 @@ static const struct qmp_phy_cfg sm8350_usb3phy_cfg = { 
	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v4_usb3phy_regs_layout,

	.regs			= qmp_v5_usb3phy_regs_layout,

	.pcs_usb_offset		= 0x300,



	.has_pwrdn_delay	= true,
@@ -1908,7 +1910,7 @@ static const struct qmp_phy_cfg sm8350_usb3_uniphy_cfg = { 
	.num_resets		= ARRAY_SIZE(msm8996_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qmp_v4_usb3phy_regs_layout,

	.regs			= qmp_v5_usb3phy_regs_layout,

	.pcs_usb_offset		= 0x1000,



	.has_pwrdn_delay	= true,
@@ -1931,7 +1933,7 @@ static const struct qmp_phy_cfg qcm2290_usb3phy_cfg = { 
	.num_resets		= ARRAY_SIZE(qcm2290_usb3phy_reset_l),

	.vreg_list		= qmp_phy_vreg_l,

	.num_vregs		= ARRAY_SIZE(qmp_phy_vreg_l),

	.regs			= qcm2290_usb3phy_regs_layout,

	.regs			= qmp_v3_usb3phy_regs_layout,

};



static void qmp_usb_configure_lane(void __iomem *base,