Commit 025a6f74 authored by Johan Hovold's avatar Johan Hovold Committed by Vinod Koul
Browse files

phy: qcom: qmp-combo: fix VCO div offset on v5_5nm and v6 



Commit 5abed58a ("phy: qcom: qmp-combo: Fix VCO div offset on v3")
fixed a regression introduced in 6.5 by making sure that the correct
offset is used for the DP_PHY_VCO_DIV register on v3 hardware.

Unfortunately, that fix instead broke DisplayPort on v5_5nm and v6
hardware as it failed to add the corresponding offsets also to those
register tables.

Fixes: 815891ee ("phy: qcom-qmp-combo: Introduce orientation variable")
Fixes: 5abed58a ("phy: qcom: qmp-combo: Fix VCO div offset on v3")
Cc: stable@vger.kernel.org	# 6.5: 5abed58a
Cc: Stephen Boyd <swboyd@chromium.org>
Cc: Abhinav Kumar <quic_abhinavk@quicinc.com>
Cc: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Signed-off-by: default avatarJohan Hovold <johan+linaro@kernel.org>
Reviewed-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarStephen Boyd <swboyd@chromium.org>
Reviewed-by: default avatarAbhinav Kumar <quic_abhinavk@quicinc.com>
Link: https://lore.kernel.org/r/20240408093023.506-1-johan+linaro@kernel.org


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

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

+2 −0
Original line number Diff line number Diff line
@@ -153,6 +153,7 @@ static const unsigned int qmp_v5_5nm_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = { 
	[QPHY_COM_BIAS_EN_CLKBUFLR_EN]	= QSERDES_V5_COM_BIAS_EN_CLKBUFLR_EN,



	[QPHY_DP_PHY_STATUS]		= QSERDES_V5_DP_PHY_STATUS,

	[QPHY_DP_PHY_VCO_DIV]		= QSERDES_V5_DP_PHY_VCO_DIV,



	[QPHY_TX_TX_POL_INV]		= QSERDES_V5_5NM_TX_TX_POL_INV,

	[QPHY_TX_TX_DRV_LVL]		= QSERDES_V5_5NM_TX_TX_DRV_LVL,
@@ -177,6 +178,7 @@ static const unsigned int qmp_v6_usb3phy_regs_layout[QPHY_LAYOUT_SIZE] = { 
	[QPHY_COM_BIAS_EN_CLKBUFLR_EN]	= QSERDES_V6_COM_PLL_BIAS_EN_CLK_BUFLR_EN,



	[QPHY_DP_PHY_STATUS]		= QSERDES_V6_DP_PHY_STATUS,

	[QPHY_DP_PHY_VCO_DIV]		= QSERDES_V6_DP_PHY_VCO_DIV,



	[QPHY_TX_TX_POL_INV]		= QSERDES_V6_TX_TX_POL_INV,

	[QPHY_TX_TX_DRV_LVL]		= QSERDES_V6_TX_TX_DRV_LVL,

drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v5.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define QCOM_PHY_QMP_DP_PHY_V5_H_



/* Only for QMP V5 PHY - DP PHY registers */

#define QSERDES_V5_DP_PHY_VCO_DIV			0x070

#define QSERDES_V5_DP_PHY_AUX_INTERRUPT_STATUS		0x0d8

#define QSERDES_V5_DP_PHY_STATUS			0x0dc

drivers/phy/qualcomm/phy-qcom-qmp-dp-phy-v6.h

+1 −0
Original line number Diff line number Diff line
@@ -7,6 +7,7 @@ 
#define QCOM_PHY_QMP_DP_PHY_V6_H_



/* Only for QMP V6 PHY - DP PHY registers */

#define QSERDES_V6_DP_PHY_VCO_DIV			0x070

#define QSERDES_V6_DP_PHY_AUX_INTERRUPT_STATUS		0x0e0

#define QSERDES_V6_DP_PHY_STATUS			0x0e4