Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

phy: qcom-qmp-usb: define QPHY_V2_PCS_PLL_LOCK_CHK_DLY_TIME register

Other PHYs tables directly reference QPHY_PLL_LOCK_CHK_DLY_TIME register
without using reglayout. Define corresponding register to be used by
msm8996 PHY tables and use it directly.

Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
Link: https://lore.kernel.org/r/20220705094320.1313312-29-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Dmitry Baryshkov and committed by
Vinod Koul
c1ab64aa d36e341a

+3 -9
-1
drivers/phy/qualcomm/phy-qcom-qmp-combo.c
··· 121 121 QPHY_COM_START_CONTROL, 122 122 QPHY_COM_PCS_READY_STATUS, 123 123 /* PCS registers */ 124 - QPHY_PLL_LOCK_CHK_DLY_TIME, 125 124 QPHY_SW_RESET, 126 125 QPHY_START_CTRL, 127 126 QPHY_PCS_READY_STATUS,
+1 -3
drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c
··· 121 121 QPHY_COM_START_CONTROL, 122 122 QPHY_COM_PCS_READY_STATUS, 123 123 /* PCS registers */ 124 - QPHY_PLL_LOCK_CHK_DLY_TIME, 125 124 QPHY_SW_RESET, 126 125 QPHY_START_CTRL, 127 126 QPHY_PCS_READY_STATUS, ··· 140 141 [QPHY_COM_POWER_DOWN_CONTROL] = 0x404, 141 142 [QPHY_COM_START_CONTROL] = 0x408, 142 143 [QPHY_COM_PCS_READY_STATUS] = 0x448, 143 - [QPHY_PLL_LOCK_CHK_DLY_TIME] = 0xa8, 144 144 [QPHY_SW_RESET] = 0x00, 145 145 [QPHY_START_CTRL] = 0x08, 146 146 [QPHY_PCS_STATUS] = 0x174, ··· 214 216 QMP_PHY_INIT_CFG(QPHY_V2_PCS_PWRUP_RESET_DLY_TIME_AUXCLK, 0x00), 215 217 QMP_PHY_INIT_CFG(QPHY_V2_PCS_LP_WAKEUP_DLY_TIME_AUXCLK, 0x01), 216 218 217 - QMP_PHY_INIT_CFG_L(QPHY_PLL_LOCK_CHK_DLY_TIME, 0x05), 219 + QMP_PHY_INIT_CFG(QPHY_V2_PCS_PLL_LOCK_CHK_DLY_TIME, 0x05), 218 220 219 221 QMP_PHY_INIT_CFG(QPHY_V2_PCS_ENDPOINT_REFCLK_DRIVE, 0x05), 220 222 QMP_PHY_INIT_CFG(QPHY_V2_PCS_POWER_DOWN_CONTROL, 0x02),
+1 -3
drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
··· 121 121 QPHY_COM_START_CONTROL, 122 122 QPHY_COM_PCS_READY_STATUS, 123 123 /* PCS registers */ 124 - QPHY_PLL_LOCK_CHK_DLY_TIME, 125 124 QPHY_SW_RESET, 126 125 QPHY_START_CTRL, 127 126 QPHY_PCS_READY_STATUS, ··· 147 148 [QPHY_COM_POWER_DOWN_CONTROL] = 0x404, 148 149 [QPHY_COM_START_CONTROL] = 0x408, 149 150 [QPHY_COM_PCS_READY_STATUS] = 0x448, 150 - [QPHY_PLL_LOCK_CHK_DLY_TIME] = 0xa8, 151 151 [QPHY_SW_RESET] = 0x00, 152 152 [QPHY_START_CTRL] = 0x08, 153 153 [QPHY_PCS_STATUS] = 0x174, ··· 433 435 QMP_PHY_INIT_CFG(QPHY_V2_PCS_L1SS_WAKEUP_DLY_TIME_AUXCLK_LSB, 0x40), 434 436 QMP_PHY_INIT_CFG(QPHY_V2_PCS_PLL_LOCK_CHK_DLY_TIME_AUXCLK_LSB, 0x0), 435 437 QMP_PHY_INIT_CFG(QPHY_V2_PCS_LP_WAKEUP_DLY_TIME_AUXCLK, 0x40), 436 - QMP_PHY_INIT_CFG_L(QPHY_PLL_LOCK_CHK_DLY_TIME, 0x73), 438 + QMP_PHY_INIT_CFG(QPHY_V2_PCS_PLL_LOCK_CHK_DLY_TIME, 0x73), 437 439 QMP_PHY_INIT_CFG(QPHY_V2_PCS_RX_SIGDET_LVL, 0x99), 438 440 QMP_PHY_INIT_CFG(QPHY_V2_PCS_TXDEEMPH_M6DB_V0, 0x15), 439 441 QMP_PHY_INIT_CFG(QPHY_V2_PCS_TXDEEMPH_M3P5DB_V0, 0xe),
+1
drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h
··· 24 24 #define QPHY_V2_PCS_LOCK_DETECT_CONFIG3 0x088 25 25 #define QPHY_V2_PCS_PWRUP_RESET_DLY_TIME_AUXCLK 0x0a0 26 26 #define QPHY_V2_PCS_LP_WAKEUP_DLY_TIME_AUXCLK 0x0a4 27 + #define QPHY_V2_PCS_PLL_LOCK_CHK_DLY_TIME 0x0a8 27 28 #define QPHY_V2_PCS_FLL_CNTRL1 0x0c0 28 29 #define QPHY_V2_PCS_FLL_CNTRL2 0x0c4 29 30 #define QPHY_V2_PCS_FLL_CNT_VAL_L 0x0c8
-1
drivers/phy/qualcomm/phy-qcom-qmp-ufs.c
··· 121 121 QPHY_COM_START_CONTROL, 122 122 QPHY_COM_PCS_READY_STATUS, 123 123 /* PCS registers */ 124 - QPHY_PLL_LOCK_CHK_DLY_TIME, 125 124 QPHY_SW_RESET, 126 125 QPHY_START_CTRL, 127 126 QPHY_PCS_READY_STATUS,
-1
drivers/phy/qualcomm/phy-qcom-qmp-usb.c
··· 121 121 QPHY_COM_START_CONTROL, 122 122 QPHY_COM_PCS_READY_STATUS, 123 123 /* PCS registers */ 124 - QPHY_PLL_LOCK_CHK_DLY_TIME, 125 124 QPHY_SW_RESET, 126 125 QPHY_START_CTRL, 127 126 QPHY_PCS_READY_STATUS,