* [PATCH 0/3] UFS: Add support for SM8150 UFS
@ 2019-09-04 10:08 Vinod Koul
2019-09-04 10:08 ` [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string Vinod Koul
` (2 more replies)
0 siblings, 3 replies; 11+ messages in thread
From: Vinod Koul @ 2019-09-04 10:08 UTC (permalink / raw)
To: Kishon Vijay Abraham I
Cc: linux-arm-msm, Bjorn Andersson, Vinod Koul, Andy Gross,
Rob Herring, Mark Rutland, linux-kernel, devicetree,
Martin K. Petersen, Evan Green, Can Guo, Stanley Chu,
Subhash Jadavani, Douglas Anderson
This series adds compatible strings for ufs hc and ufs qmp phy found in
Qualcomm SM8150 SoC. Also update the qmp phy driver with version 4 and
support for ufs phy.
Vinod Koul (3):
dt-bindings: ufs: Add sm8150 compatible string
dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy compatible string
phy: qcom-qmp: Add SM8150 QMP UFS PHY support
.../devicetree/bindings/phy/qcom-qmp-phy.txt | 7 +-
.../devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 +
drivers/phy/qualcomm/phy-qcom-qmp.c | 125 ++++++++++++++++++
drivers/phy/qualcomm/phy-qcom-qmp.h | 96 ++++++++++++++
4 files changed, 228 insertions(+), 1 deletion(-)
--
2.20.1
^ permalink raw reply [flat|nested] 11+ messages in thread* [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string 2019-09-04 10:08 [PATCH 0/3] UFS: Add support for SM8150 UFS Vinod Koul @ 2019-09-04 10:08 ` Vinod Koul 2019-09-04 18:49 ` Bjorn Andersson 2019-09-04 23:21 ` Stephen Boyd 2019-09-04 10:08 ` [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy " Vinod Koul 2019-09-04 10:08 ` [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support Vinod Koul 2 siblings, 2 replies; 11+ messages in thread From: Vinod Koul @ 2019-09-04 10:08 UTC (permalink / raw) To: Kishon Vijay Abraham I Cc: linux-arm-msm, Bjorn Andersson, Vinod Koul, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree, Martin K. Petersen, Evan Green, Can Guo, Stanley Chu, Subhash Jadavani, Douglas Anderson Document "qcom,sm8150-ufshc" compatible string for UFS HC found on SM8150. Signed-off-by: Vinod Koul <vkoul@kernel.org> --- Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt index a74720486ee2..7529e2c26127 100644 --- a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt +++ b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt @@ -13,6 +13,7 @@ Required properties: "qcom,msm8996-ufshc", "qcom,ufshc", "jedec,ufs-2.0" "qcom,msm8998-ufshc", "qcom,ufshc", "jedec,ufs-2.0" "qcom,sdm845-ufshc", "qcom,ufshc", "jedec,ufs-2.0" + "qcom,sm8150-ufshc", "qcom,ufshc", "jedec,ufs-2.0" - interrupts : <interrupt mapping for UFS host controller IRQ> - reg : <registers mapping> -- 2.20.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string 2019-09-04 10:08 ` [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string Vinod Koul @ 2019-09-04 18:49 ` Bjorn Andersson 2019-09-04 23:21 ` Stephen Boyd 1 sibling, 0 replies; 11+ messages in thread From: Bjorn Andersson @ 2019-09-04 18:49 UTC (permalink / raw) To: Vinod Koul Cc: Kishon Vijay Abraham I, linux-arm-msm, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree, Martin K. Petersen, Evan Green, Can Guo, Stanley Chu, Subhash Jadavani, Douglas Anderson On Wed 04 Sep 03:08 PDT 2019, Vinod Koul wrote: > Document "qcom,sm8150-ufshc" compatible string for UFS HC found on > SM8150. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Vinod Koul <vkoul@kernel.org> > --- > Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt | 1 + > 1 file changed, 1 insertion(+) > > diff --git a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt > index a74720486ee2..7529e2c26127 100644 > --- a/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt > +++ b/Documentation/devicetree/bindings/ufs/ufshcd-pltfrm.txt > @@ -13,6 +13,7 @@ Required properties: > "qcom,msm8996-ufshc", "qcom,ufshc", "jedec,ufs-2.0" > "qcom,msm8998-ufshc", "qcom,ufshc", "jedec,ufs-2.0" > "qcom,sdm845-ufshc", "qcom,ufshc", "jedec,ufs-2.0" > + "qcom,sm8150-ufshc", "qcom,ufshc", "jedec,ufs-2.0" > - interrupts : <interrupt mapping for UFS host controller IRQ> > - reg : <registers mapping> > > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string 2019-09-04 10:08 ` [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string Vinod Koul 2019-09-04 18:49 ` Bjorn Andersson @ 2019-09-04 23:21 ` Stephen Boyd 1 sibling, 0 replies; 11+ messages in thread From: Stephen Boyd @ 2019-09-04 23:21 UTC (permalink / raw) To: Kishon Vijay Abraham I, Vinod Koul Cc: linux-arm-msm, Bjorn Andersson, Vinod Koul, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree, Martin K. Petersen, Evan Green, Can Guo, Stanley Chu, Subhash Jadavani, Douglas Anderson Quoting Vinod Koul (2019-09-04 03:08:33) > Document "qcom,sm8150-ufshc" compatible string for UFS HC found on > SM8150. > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy compatible string 2019-09-04 10:08 [PATCH 0/3] UFS: Add support for SM8150 UFS Vinod Koul 2019-09-04 10:08 ` [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string Vinod Koul @ 2019-09-04 10:08 ` Vinod Koul 2019-09-04 18:49 ` Bjorn Andersson 2019-09-04 23:21 ` Stephen Boyd 2019-09-04 10:08 ` [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support Vinod Koul 2 siblings, 2 replies; 11+ messages in thread From: Vinod Koul @ 2019-09-04 10:08 UTC (permalink / raw) To: Kishon Vijay Abraham I Cc: linux-arm-msm, Bjorn Andersson, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree, Vinod Koul Document "qcom,sdm845-qmp-ufs-phy" compatible string for QMP UFS PHY found on SM8150. Signed-off-by: Vinod Koul <vkoul@kernel.org> --- Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt index 085fbd676cfc..eac9ad3cbbc8 100644 --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt @@ -14,7 +14,8 @@ Required properties: "qcom,msm8998-qmp-pcie-phy" for PCIe QMP phy on msm8998, "qcom,sdm845-qmp-usb3-phy" for USB3 QMP V3 phy on sdm845, "qcom,sdm845-qmp-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845, - "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845. + "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845, + "qcom,sm8150-qmp-ufs-phy" for UFS QMP phy on sm8150. - reg: - index 0: address and length of register set for PHY's common @@ -57,6 +58,8 @@ Required properties: "aux", "cfg_ahb", "ref", "com_aux". For "qcom,sdm845-qmp-ufs-phy" must contain: "ref", "ref_aux". + For "qcom,sm8150-qmp-ufs-phy" must contain: + "ref", "ref_aux". - resets: a list of phandles and reset controller specifier pairs, one for each entry in reset-names. @@ -83,6 +86,8 @@ Required properties: "phy", "common". For "qcom,sdm845-qmp-ufs-phy": must contain: "ufsphy". + For "qcom,sm8150-qmp-ufs-phy": must contain: + "ufsphy". - vdda-phy-supply: Phandle to a regulator supply to PHY core block. - vdda-pll-supply: Phandle to 1.8V regulator supply to PHY refclk pll block. -- 2.20.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy compatible string 2019-09-04 10:08 ` [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy " Vinod Koul @ 2019-09-04 18:49 ` Bjorn Andersson 2019-09-04 23:21 ` Stephen Boyd 1 sibling, 0 replies; 11+ messages in thread From: Bjorn Andersson @ 2019-09-04 18:49 UTC (permalink / raw) To: Vinod Koul Cc: Kishon Vijay Abraham I, linux-arm-msm, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree On Wed 04 Sep 03:08 PDT 2019, Vinod Koul wrote: > Document "qcom,sdm845-qmp-ufs-phy" compatible string for QMP UFS PHY > found on SM8150. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Vinod Koul <vkoul@kernel.org> > --- > Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt | 7 ++++++- > 1 file changed, 6 insertions(+), 1 deletion(-) > > diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > index 085fbd676cfc..eac9ad3cbbc8 100644 > --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt > @@ -14,7 +14,8 @@ Required properties: > "qcom,msm8998-qmp-pcie-phy" for PCIe QMP phy on msm8998, > "qcom,sdm845-qmp-usb3-phy" for USB3 QMP V3 phy on sdm845, > "qcom,sdm845-qmp-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845, > - "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845. > + "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845, > + "qcom,sm8150-qmp-ufs-phy" for UFS QMP phy on sm8150. > > - reg: > - index 0: address and length of register set for PHY's common > @@ -57,6 +58,8 @@ Required properties: > "aux", "cfg_ahb", "ref", "com_aux". > For "qcom,sdm845-qmp-ufs-phy" must contain: > "ref", "ref_aux". > + For "qcom,sm8150-qmp-ufs-phy" must contain: > + "ref", "ref_aux". > > - resets: a list of phandles and reset controller specifier pairs, > one for each entry in reset-names. > @@ -83,6 +86,8 @@ Required properties: > "phy", "common". > For "qcom,sdm845-qmp-ufs-phy": must contain: > "ufsphy". > + For "qcom,sm8150-qmp-ufs-phy": must contain: > + "ufsphy". > > - vdda-phy-supply: Phandle to a regulator supply to PHY core block. > - vdda-pll-supply: Phandle to 1.8V regulator supply to PHY refclk pll block. > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy compatible string 2019-09-04 10:08 ` [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy " Vinod Koul 2019-09-04 18:49 ` Bjorn Andersson @ 2019-09-04 23:21 ` Stephen Boyd 1 sibling, 0 replies; 11+ messages in thread From: Stephen Boyd @ 2019-09-04 23:21 UTC (permalink / raw) To: Kishon Vijay Abraham I, Vinod Koul Cc: linux-arm-msm, Bjorn Andersson, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree, Vinod Koul Quoting Vinod Koul (2019-09-04 03:08:34) > Document "qcom,sdm845-qmp-ufs-phy" compatible string for QMP UFS PHY > found on SM8150. > > Signed-off-by: Vinod Koul <vkoul@kernel.org> > --- Reviewed-by: Stephen Boyd <swboyd@chromium.org> ^ permalink raw reply [flat|nested] 11+ messages in thread
* [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support 2019-09-04 10:08 [PATCH 0/3] UFS: Add support for SM8150 UFS Vinod Koul 2019-09-04 10:08 ` [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string Vinod Koul 2019-09-04 10:08 ` [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy " Vinod Koul @ 2019-09-04 10:08 ` Vinod Koul 2019-09-04 18:52 ` Bjorn Andersson 2019-09-04 23:23 ` Stephen Boyd 2 siblings, 2 replies; 11+ messages in thread From: Vinod Koul @ 2019-09-04 10:08 UTC (permalink / raw) To: Kishon Vijay Abraham I Cc: linux-arm-msm, Bjorn Andersson, Vinod Koul, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree SM8150 UFS PHY is v4 of QMP phy. Add support for V4 QMP phy register defines and support for SM8150 QMP UFS PHY. Signed-off-by: Vinod Koul <vkoul@kernel.org> --- drivers/phy/qualcomm/phy-qcom-qmp.c | 125 ++++++++++++++++++++++++++++ drivers/phy/qualcomm/phy-qcom-qmp.h | 96 +++++++++++++++++++++ 2 files changed, 221 insertions(+) diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c index 34ff6434da8f..0dd49a22d72c 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.c +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c @@ -164,6 +164,11 @@ static const unsigned int sdm845_ufsphy_regs_layout[] = { [QPHY_PCS_READY_STATUS] = 0x160, }; +static const unsigned int sm8150_ufsphy_regs_layout[] = { + [QPHY_START_CTRL] = 0x00, + [QPHY_PCS_READY_STATUS] = 0x180, +}; + static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = { QMP_PHY_INIT_CFG(QSERDES_COM_BIAS_EN_CLKBUFLR_EN, 0x1c), QMP_PHY_INIT_CFG(QSERDES_COM_CLK_ENABLE1, 0x10), @@ -878,6 +883,93 @@ static const struct qmp_phy_init_tbl msm8998_usb3_pcs_tbl[] = { QMP_PHY_INIT_CFG(QPHY_V3_PCS_RXEQTRAINING_RUN_TIME, 0x13), }; +static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = { + QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_SYSCLK_EN_SEL, 0xD9), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_SEL, 0x11), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_HS_SWITCH_SEL, 0x00), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP_EN, 0x01), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_MAP, 0x02), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_IVCO, 0x0F), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_INITVAL2, 0x00), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_HSCLK_SEL, 0x11), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_DEC_START_MODE0, 0x82), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_CP_CTRL_MODE0, 0x06), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_RCTRL_MODE0, 0x16), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_CCTRL_MODE0, 0x36), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP1_MODE0, 0xFF), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP2_MODE0, 0x0C), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE0, 0xAC), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE0, 0x1E), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_DEC_START_MODE1, 0x98), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_CP_CTRL_MODE1, 0x06), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_RCTRL_MODE1, 0x16), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_CCTRL_MODE1, 0x36), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP1_MODE1, 0x32), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP2_MODE1, 0x0F), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE1, 0xDD), + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE1, 0x23), + + /* Rate B */ + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_MAP, 0x06), +}; + +static const struct qmp_phy_init_tbl sm8150_ufsphy_tx_tbl[] = { + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_1_DIVIDER_BAND0_1, 0x06), + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_2_DIVIDER_BAND0_1, 0x03), + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_3_DIVIDER_BAND0_1, 0x01), + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_4_DIVIDER_BAND0_1, 0x00), + QMP_PHY_INIT_CFG(QSERDES_V4_TX_LANE_MODE_1, 0x05), + QMP_PHY_INIT_CFG(QSERDES_V4_TX_TRAN_DRVR_EMP_EN, 0x0C), +}; + +static const struct qmp_phy_init_tbl sm8150_ufsphy_rx_tbl[] = { + QMP_PHY_INIT_CFG(QSERDES_V4_RX_SIGDET_LVL, 0x24), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_SIGDET_CNTRL, 0x0F), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_SIGDET_DEGLITCH_CNTRL, 0x1E), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_BAND, 0x18), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_FASTLOCK_FO_GAIN, 0x0A), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4B), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_PI_CONTROLS, 0xF1), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_FASTLOCK_COUNT_LOW, 0x80), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_PI_CTRL2, 0x80), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_FO_GAIN, 0x0C), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_SO_GAIN, 0x04), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_TERM_BW, 0x1B), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL2, 0x06), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL3, 0x04), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL4, 0x1D), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_OFFSET_ADAPTOR_CNTRL2, 0x00), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_IDAC_MEASURE_TIME, 0x10), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_IDAC_TSETTLE_LOW, 0xC0), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_IDAC_TSETTLE_HIGH, 0x00), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_LOW, 0x36), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH, 0x36), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH2, 0xF6), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH3, 0x3B), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH4, 0x3D), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_LOW, 0xE0), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH, 0xC8), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH2, 0xC8), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH3, 0x3B), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH4, 0xB1), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_LOW, 0xE0), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH, 0xC8), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH2, 0xC8), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH3, 0x3B), + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH4, 0xB1), + +}; + +static const struct qmp_phy_init_tbl sm8150_ufsphy_pcs_tbl[] = { + QMP_PHY_INIT_CFG(QPHY_V4_RX_SIGDET_CTRL2, 0x6D), + QMP_PHY_INIT_CFG(QPHY_V4_TX_LARGE_AMP_DRV_LVL, 0x0A), + QMP_PHY_INIT_CFG(QPHY_V4_TX_SMALL_AMP_DRV_LVL, 0x02), + QMP_PHY_INIT_CFG(QPHY_V4_TX_MID_TERM_CTRL1, 0x43), + QMP_PHY_INIT_CFG(QPHY_V4_DEBUG_BUS_CLKSEL, 0x1F), + QMP_PHY_INIT_CFG(QPHY_V4_RX_MIN_HIBERN8_TIME, 0xFF), + QMP_PHY_INIT_CFG(QPHY_V4_MULTI_LANE_CTRL1, 0x02), +}; /* struct qmp_phy_cfg - per-PHY initialization config */ struct qmp_phy_cfg { @@ -1038,6 +1130,10 @@ static const char * const sdm845_ufs_phy_clk_l[] = { "ref", "ref_aux", }; +static const char * const sm8150_ufs_phy_clk_l[] = { + "ref", "ref_aux", +}; + /* list of resets */ static const char * const msm8996_pciephy_reset_l[] = { "phy", "common", "cfg", @@ -1284,6 +1380,32 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { .is_dual_lane_phy = true, }; +static const struct qmp_phy_cfg sm8150_ufsphy_cfg = { + .type = PHY_TYPE_UFS, + .nlanes = 2, + + .serdes_tbl = sm8150_ufsphy_serdes_tbl, + .serdes_tbl_num = ARRAY_SIZE(sm8150_ufsphy_serdes_tbl), + .tx_tbl = sm8150_ufsphy_tx_tbl, + .tx_tbl_num = ARRAY_SIZE(sm8150_ufsphy_tx_tbl), + .rx_tbl = sm8150_ufsphy_rx_tbl, + .rx_tbl_num = ARRAY_SIZE(sm8150_ufsphy_rx_tbl), + .pcs_tbl = sm8150_ufsphy_pcs_tbl, + .pcs_tbl_num = ARRAY_SIZE(sm8150_ufsphy_pcs_tbl), + .clk_list = sm8150_ufs_phy_clk_l, + .num_clks = ARRAY_SIZE(sm8150_ufs_phy_clk_l), + .vreg_list = qmp_phy_vreg_l, + .num_vregs = ARRAY_SIZE(qmp_phy_vreg_l), + .regs = sm8150_ufsphy_regs_layout, + + .start_ctrl = SERDES_START, + .pwrdn_ctrl = SW_PWRDN, + .mask_pcs_ready = PCS_READY, + + .is_dual_lane_phy = true, + .no_pcs_sw_reset = true, +}; + static void qcom_qmp_phy_configure(void __iomem *base, const unsigned int *regs, const struct qmp_phy_init_tbl tbl[], @@ -1999,6 +2121,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = { }, { .compatible = "qcom,msm8998-qmp-usb3-phy", .data = &msm8998_usb3phy_cfg, + }, { + .compatible = "qcom,sm8150-qmp-ufs-phy", + .data = &sm8150_ufsphy_cfg, }, { }, }; diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.h b/drivers/phy/qualcomm/phy-qcom-qmp.h index 335ea5d7ef40..0eefd8621669 100644 --- a/drivers/phy/qualcomm/phy-qcom-qmp.h +++ b/drivers/phy/qualcomm/phy-qcom-qmp.h @@ -313,4 +313,100 @@ #define QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG4 0x5c #define QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG5 0x60 +/* Only for QMP V4 PHY - QSERDES COM registers */ +#define QSERDES_COM_V4_SYSCLK_EN_SEL 0x094 +#define QSERDES_COM_V4_HSCLK_SEL 0x158 +#define QSERDES_COM_V4_HSCLK_HS_SWITCH_SEL 0x15C +#define QSERDES_COM_V4_LOCK_CMP_EN 0x0A4 +#define QSERDES_COM_V4_VCO_TUNE_MAP 0x10C +#define QSERDES_COM_V4_PLL_IVCO 0x058 +#define QSERDES_COM_V4_VCO_TUNE_INITVAL2 0x124 +#define QSERDES_COM_V4_BIN_VCOCAL_HSCLK_SEL 0x1BC +#define QSERDES_COM_V4_DEC_START_MODE0 0x0BC +#define QSERDES_COM_V4_CP_CTRL_MODE0 0x074 +#define QSERDES_COM_V4_PLL_RCTRL_MODE0 0x07C +#define QSERDES_COM_V4_PLL_CCTRL_MODE0 0x084 +#define QSERDES_COM_V4_LOCK_CMP1_MODE0 0x0AC +#define QSERDES_COM_V4_LOCK_CMP2_MODE0 0x0B0 +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE0 0x1AC +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE0 0x1B0 +#define QSERDES_COM_V4_DEC_START_MODE1 0x0C4 +#define QSERDES_COM_V4_CP_CTRL_MODE1 0x078 +#define QSERDES_COM_V4_PLL_RCTRL_MODE1 0x080 +#define QSERDES_COM_V4_PLL_CCTRL_MODE1 0x088 +#define QSERDES_COM_V4_LOCK_CMP1_MODE1 0x0B4 +#define QSERDES_COM_V4_LOCK_CMP2_MODE1 0x0B8 +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE1 0x1B4 +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE1 0x1B8 +#define QSERDES_COM_V4_CMN_IPTRIM 0x060 + +/* Only for QMP V4 PHY - TX registers */ +#define QSERDES_V4_TX_PWM_GEAR_1_DIVIDER_BAND0_1 0xD8 +#define QSERDES_V4_TX_PWM_GEAR_2_DIVIDER_BAND0_1 0xDC +#define QSERDES_V4_TX_PWM_GEAR_3_DIVIDER_BAND0_1 0xE0 +#define QSERDES_V4_TX_PWM_GEAR_4_DIVIDER_BAND0_1 0xE4 +#define QSERDES_V4_TX_LANE_MODE_1 0x84 +#define QSERDES_V4_TX_TRAN_DRVR_EMP_EN 0xB8 + +/* Only for QMP V4 PHY - RX registers */ +#define QSERDES_V4_RX_SIGDET_LVL 0x120 +#define QSERDES_V4_RX_SIGDET_CNTRL 0x11C +#define QSERDES_V4_RX_SIGDET_DEGLITCH_CNTRL 0x124 +#define QSERDES_V4_RX_RX_BAND 0x128 +#define QSERDES_V4_RX_UCDR_FASTLOCK_FO_GAIN 0x030 +#define QSERDES_V4_RX_UCDR_SO_SATURATION_AND_ENABLE 0x034 +#define QSERDES_V4_RX_UCDR_PI_CONTROLS 0x044 +#define QSERDES_V4_RX_UCDR_FASTLOCK_COUNT_LOW 0x03C +#define QSERDES_V4_RX_UCDR_PI_CTRL2 0x048 +#define QSERDES_V4_RX_RX_TERM_BW 0x080 +#define QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL2 0x0EC +#define QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL3 0x0F0 +#define QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL4 0x0F4 +#define QSERDES_V4_RX_RX_OFFSET_ADAPTOR_CNTRL2 0x114 +#define QSERDES_V4_RX_RX_IDAC_MEASURE_TIME 0x100 +#define QSERDES_V4_RX_RX_IDAC_TSETTLE_LOW 0x0F8 +#define QSERDES_V4_RX_RX_IDAC_TSETTLE_HIGH 0x0FC +#define QSERDES_V4_RX_RX_MODE_00_LOW 0x170 +#define QSERDES_V4_RX_RX_MODE_00_HIGH 0x174 +#define QSERDES_V4_RX_RX_MODE_00_HIGH2 0x178 +#define QSERDES_V4_RX_RX_MODE_00_HIGH3 0x17C +#define QSERDES_V4_RX_RX_MODE_00_HIGH4 0x180 +#define QSERDES_V4_RX_RX_MODE_01_LOW 0x184 +#define QSERDES_V4_RX_RX_MODE_01_HIGH 0x188 +#define QSERDES_V4_RX_RX_MODE_01_HIGH2 0x18C +#define QSERDES_V4_RX_RX_MODE_01_HIGH3 0x190 +#define QSERDES_V4_RX_RX_MODE_01_HIGH4 0x194 +#define QSERDES_V4_RX_RX_MODE_10_LOW 0x198 +#define QSERDES_V4_RX_RX_MODE_10_HIGH 0x19C +#define QSERDES_V4_RX_RX_MODE_10_HIGH2 0x1A0 +#define QSERDES_V4_RX_RX_MODE_10_HIGH3 0x1A4 +#define QSERDES_V4_RX_RX_MODE_10_HIGH4 0x1A8 +#define QSERDES_V4_RX_DCC_CTRL1 0x1BC +#define QSERDES_V4_RX_AC_JTAG_ENABLE 0x068 +#define QSERDES_V4_RX_UCDR_FO_GAIN 0x008 +#define QSERDES_V4_RX_UCDR_SO_GAIN 0x014 +#define QSERDES_V4_RX_AC_JTAG_MODE 0x078 + +/* Only for QMP V4 PHY - PCS registers */ +#define QPHY_V4_PHY_START 0x000 +#define QPHY_V4_POWER_DOWN_CONTROL 0x004 +#define QPHY_V4_SW_RESET 0x008 +#define QPHY_V4_PCS_READY_STATUS 0x180 +#define QPHY_V4_LINECFG_DISABLE 0x148 +#define QPHY_V4_MULTI_LANE_CTRL1 0x1E0 +#define QPHY_V4_RX_SIGDET_CTRL2 0x158 +#define QPHY_V4_TX_LARGE_AMP_DRV_LVL 0x030 +#define QPHY_V4_TX_SMALL_AMP_DRV_LVL 0x038 +#define QPHY_V4_TX_MID_TERM_CTRL1 0x1D8 +#define QPHY_V4_DEBUG_BUS_CLKSEL 0x124 +#define QPHY_V4_PLL_CNTL 0x02C +#define QPHY_V4_TIMER_20US_CORECLK_STEPS_MSB 0x00C +#define QPHY_V4_TIMER_20US_CORECLK_STEPS_LSB 0x010 +#define QPHY_V4_TX_PWM_GEAR_BAND 0x160 +#define QPHY_V4_TX_HS_GEAR_BAND 0x168 +#define QPHY_V4_TX_HSGEAR_CAPABILITY 0x074 +#define QPHY_V4_RX_HSGEAR_CAPABILITY 0x0B4 +#define QPHY_V4_RX_MIN_HIBERN8_TIME 0x150 +#define QPHY_V4_BIST_FIXED_PAT_CTRL 0x060 + #endif -- 2.20.1 ^ permalink raw reply related [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support 2019-09-04 10:08 ` [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support Vinod Koul @ 2019-09-04 18:52 ` Bjorn Andersson 2019-09-04 23:23 ` Stephen Boyd 1 sibling, 0 replies; 11+ messages in thread From: Bjorn Andersson @ 2019-09-04 18:52 UTC (permalink / raw) To: Vinod Koul Cc: Kishon Vijay Abraham I, linux-arm-msm, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree On Wed 04 Sep 03:08 PDT 2019, Vinod Koul wrote: > SM8150 UFS PHY is v4 of QMP phy. Add support for V4 QMP phy register > defines and support for SM8150 QMP UFS PHY. > Reviewed-by: Bjorn Andersson <bjorn.andersson@linaro.org> > Signed-off-by: Vinod Koul <vkoul@kernel.org> > --- > drivers/phy/qualcomm/phy-qcom-qmp.c | 125 ++++++++++++++++++++++++++++ > drivers/phy/qualcomm/phy-qcom-qmp.h | 96 +++++++++++++++++++++ > 2 files changed, 221 insertions(+) > > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c > index 34ff6434da8f..0dd49a22d72c 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp.c > +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c > @@ -164,6 +164,11 @@ static const unsigned int sdm845_ufsphy_regs_layout[] = { > [QPHY_PCS_READY_STATUS] = 0x160, > }; > > +static const unsigned int sm8150_ufsphy_regs_layout[] = { > + [QPHY_START_CTRL] = 0x00, > + [QPHY_PCS_READY_STATUS] = 0x180, > +}; > + > static const struct qmp_phy_init_tbl msm8996_pcie_serdes_tbl[] = { > QMP_PHY_INIT_CFG(QSERDES_COM_BIAS_EN_CLKBUFLR_EN, 0x1c), > QMP_PHY_INIT_CFG(QSERDES_COM_CLK_ENABLE1, 0x10), > @@ -878,6 +883,93 @@ static const struct qmp_phy_init_tbl msm8998_usb3_pcs_tbl[] = { > QMP_PHY_INIT_CFG(QPHY_V3_PCS_RXEQTRAINING_RUN_TIME, 0x13), > }; > > +static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = { > + QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_SYSCLK_EN_SEL, 0xD9), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_SEL, 0x11), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_HS_SWITCH_SEL, 0x00), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP_EN, 0x01), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_MAP, 0x02), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_IVCO, 0x0F), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_INITVAL2, 0x00), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_HSCLK_SEL, 0x11), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_DEC_START_MODE0, 0x82), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_CP_CTRL_MODE0, 0x06), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_RCTRL_MODE0, 0x16), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_CCTRL_MODE0, 0x36), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP1_MODE0, 0xFF), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP2_MODE0, 0x0C), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE0, 0xAC), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE0, 0x1E), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_DEC_START_MODE1, 0x98), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_CP_CTRL_MODE1, 0x06), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_RCTRL_MODE1, 0x16), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_CCTRL_MODE1, 0x36), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP1_MODE1, 0x32), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP2_MODE1, 0x0F), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE1, 0xDD), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE1, 0x23), > + > + /* Rate B */ > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_MAP, 0x06), > +}; > + > +static const struct qmp_phy_init_tbl sm8150_ufsphy_tx_tbl[] = { > + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_1_DIVIDER_BAND0_1, 0x06), > + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_2_DIVIDER_BAND0_1, 0x03), > + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_3_DIVIDER_BAND0_1, 0x01), > + QMP_PHY_INIT_CFG(QSERDES_V4_TX_PWM_GEAR_4_DIVIDER_BAND0_1, 0x00), > + QMP_PHY_INIT_CFG(QSERDES_V4_TX_LANE_MODE_1, 0x05), > + QMP_PHY_INIT_CFG(QSERDES_V4_TX_TRAN_DRVR_EMP_EN, 0x0C), > +}; > + > +static const struct qmp_phy_init_tbl sm8150_ufsphy_rx_tbl[] = { > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_SIGDET_LVL, 0x24), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_SIGDET_CNTRL, 0x0F), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_SIGDET_DEGLITCH_CNTRL, 0x1E), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_BAND, 0x18), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_FASTLOCK_FO_GAIN, 0x0A), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4B), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_PI_CONTROLS, 0xF1), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_FASTLOCK_COUNT_LOW, 0x80), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_PI_CTRL2, 0x80), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_FO_GAIN, 0x0C), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_UCDR_SO_GAIN, 0x04), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_TERM_BW, 0x1B), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL2, 0x06), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL3, 0x04), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL4, 0x1D), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_OFFSET_ADAPTOR_CNTRL2, 0x00), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_IDAC_MEASURE_TIME, 0x10), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_IDAC_TSETTLE_LOW, 0xC0), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_IDAC_TSETTLE_HIGH, 0x00), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_LOW, 0x36), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH, 0x36), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH2, 0xF6), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH3, 0x3B), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_00_HIGH4, 0x3D), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_LOW, 0xE0), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH, 0xC8), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH2, 0xC8), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH3, 0x3B), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_01_HIGH4, 0xB1), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_LOW, 0xE0), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH, 0xC8), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH2, 0xC8), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH3, 0x3B), > + QMP_PHY_INIT_CFG(QSERDES_V4_RX_RX_MODE_10_HIGH4, 0xB1), > + > +}; > + > +static const struct qmp_phy_init_tbl sm8150_ufsphy_pcs_tbl[] = { > + QMP_PHY_INIT_CFG(QPHY_V4_RX_SIGDET_CTRL2, 0x6D), > + QMP_PHY_INIT_CFG(QPHY_V4_TX_LARGE_AMP_DRV_LVL, 0x0A), > + QMP_PHY_INIT_CFG(QPHY_V4_TX_SMALL_AMP_DRV_LVL, 0x02), > + QMP_PHY_INIT_CFG(QPHY_V4_TX_MID_TERM_CTRL1, 0x43), > + QMP_PHY_INIT_CFG(QPHY_V4_DEBUG_BUS_CLKSEL, 0x1F), > + QMP_PHY_INIT_CFG(QPHY_V4_RX_MIN_HIBERN8_TIME, 0xFF), > + QMP_PHY_INIT_CFG(QPHY_V4_MULTI_LANE_CTRL1, 0x02), > +}; > > /* struct qmp_phy_cfg - per-PHY initialization config */ > struct qmp_phy_cfg { > @@ -1038,6 +1130,10 @@ static const char * const sdm845_ufs_phy_clk_l[] = { > "ref", "ref_aux", > }; > > +static const char * const sm8150_ufs_phy_clk_l[] = { > + "ref", "ref_aux", > +}; > + > /* list of resets */ > static const char * const msm8996_pciephy_reset_l[] = { > "phy", "common", "cfg", > @@ -1284,6 +1380,32 @@ static const struct qmp_phy_cfg msm8998_usb3phy_cfg = { > .is_dual_lane_phy = true, > }; > > +static const struct qmp_phy_cfg sm8150_ufsphy_cfg = { > + .type = PHY_TYPE_UFS, > + .nlanes = 2, > + > + .serdes_tbl = sm8150_ufsphy_serdes_tbl, > + .serdes_tbl_num = ARRAY_SIZE(sm8150_ufsphy_serdes_tbl), > + .tx_tbl = sm8150_ufsphy_tx_tbl, > + .tx_tbl_num = ARRAY_SIZE(sm8150_ufsphy_tx_tbl), > + .rx_tbl = sm8150_ufsphy_rx_tbl, > + .rx_tbl_num = ARRAY_SIZE(sm8150_ufsphy_rx_tbl), > + .pcs_tbl = sm8150_ufsphy_pcs_tbl, > + .pcs_tbl_num = ARRAY_SIZE(sm8150_ufsphy_pcs_tbl), > + .clk_list = sm8150_ufs_phy_clk_l, > + .num_clks = ARRAY_SIZE(sm8150_ufs_phy_clk_l), > + .vreg_list = qmp_phy_vreg_l, > + .num_vregs = ARRAY_SIZE(qmp_phy_vreg_l), > + .regs = sm8150_ufsphy_regs_layout, > + > + .start_ctrl = SERDES_START, > + .pwrdn_ctrl = SW_PWRDN, > + .mask_pcs_ready = PCS_READY, > + > + .is_dual_lane_phy = true, > + .no_pcs_sw_reset = true, > +}; > + > static void qcom_qmp_phy_configure(void __iomem *base, > const unsigned int *regs, > const struct qmp_phy_init_tbl tbl[], > @@ -1999,6 +2121,9 @@ static const struct of_device_id qcom_qmp_phy_of_match_table[] = { > }, { > .compatible = "qcom,msm8998-qmp-usb3-phy", > .data = &msm8998_usb3phy_cfg, > + }, { > + .compatible = "qcom,sm8150-qmp-ufs-phy", > + .data = &sm8150_ufsphy_cfg, > }, > { }, > }; > diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.h b/drivers/phy/qualcomm/phy-qcom-qmp.h > index 335ea5d7ef40..0eefd8621669 100644 > --- a/drivers/phy/qualcomm/phy-qcom-qmp.h > +++ b/drivers/phy/qualcomm/phy-qcom-qmp.h > @@ -313,4 +313,100 @@ > #define QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG4 0x5c > #define QPHY_V3_PCS_MISC_OSC_DTCT_MODE2_CONFIG5 0x60 > > +/* Only for QMP V4 PHY - QSERDES COM registers */ > +#define QSERDES_COM_V4_SYSCLK_EN_SEL 0x094 > +#define QSERDES_COM_V4_HSCLK_SEL 0x158 > +#define QSERDES_COM_V4_HSCLK_HS_SWITCH_SEL 0x15C > +#define QSERDES_COM_V4_LOCK_CMP_EN 0x0A4 > +#define QSERDES_COM_V4_VCO_TUNE_MAP 0x10C > +#define QSERDES_COM_V4_PLL_IVCO 0x058 > +#define QSERDES_COM_V4_VCO_TUNE_INITVAL2 0x124 > +#define QSERDES_COM_V4_BIN_VCOCAL_HSCLK_SEL 0x1BC > +#define QSERDES_COM_V4_DEC_START_MODE0 0x0BC > +#define QSERDES_COM_V4_CP_CTRL_MODE0 0x074 > +#define QSERDES_COM_V4_PLL_RCTRL_MODE0 0x07C > +#define QSERDES_COM_V4_PLL_CCTRL_MODE0 0x084 > +#define QSERDES_COM_V4_LOCK_CMP1_MODE0 0x0AC > +#define QSERDES_COM_V4_LOCK_CMP2_MODE0 0x0B0 > +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE0 0x1AC > +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE0 0x1B0 > +#define QSERDES_COM_V4_DEC_START_MODE1 0x0C4 > +#define QSERDES_COM_V4_CP_CTRL_MODE1 0x078 > +#define QSERDES_COM_V4_PLL_RCTRL_MODE1 0x080 > +#define QSERDES_COM_V4_PLL_CCTRL_MODE1 0x088 > +#define QSERDES_COM_V4_LOCK_CMP1_MODE1 0x0B4 > +#define QSERDES_COM_V4_LOCK_CMP2_MODE1 0x0B8 > +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE1_MODE1 0x1B4 > +#define QSERDES_COM_V4_BIN_VCOCAL_CMP_CODE2_MODE1 0x1B8 > +#define QSERDES_COM_V4_CMN_IPTRIM 0x060 > + > +/* Only for QMP V4 PHY - TX registers */ > +#define QSERDES_V4_TX_PWM_GEAR_1_DIVIDER_BAND0_1 0xD8 > +#define QSERDES_V4_TX_PWM_GEAR_2_DIVIDER_BAND0_1 0xDC > +#define QSERDES_V4_TX_PWM_GEAR_3_DIVIDER_BAND0_1 0xE0 > +#define QSERDES_V4_TX_PWM_GEAR_4_DIVIDER_BAND0_1 0xE4 > +#define QSERDES_V4_TX_LANE_MODE_1 0x84 > +#define QSERDES_V4_TX_TRAN_DRVR_EMP_EN 0xB8 > + > +/* Only for QMP V4 PHY - RX registers */ > +#define QSERDES_V4_RX_SIGDET_LVL 0x120 > +#define QSERDES_V4_RX_SIGDET_CNTRL 0x11C > +#define QSERDES_V4_RX_SIGDET_DEGLITCH_CNTRL 0x124 > +#define QSERDES_V4_RX_RX_BAND 0x128 > +#define QSERDES_V4_RX_UCDR_FASTLOCK_FO_GAIN 0x030 > +#define QSERDES_V4_RX_UCDR_SO_SATURATION_AND_ENABLE 0x034 > +#define QSERDES_V4_RX_UCDR_PI_CONTROLS 0x044 > +#define QSERDES_V4_RX_UCDR_FASTLOCK_COUNT_LOW 0x03C > +#define QSERDES_V4_RX_UCDR_PI_CTRL2 0x048 > +#define QSERDES_V4_RX_RX_TERM_BW 0x080 > +#define QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL2 0x0EC > +#define QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL3 0x0F0 > +#define QSERDES_V4_RX_RX_EQU_ADAPTOR_CNTRL4 0x0F4 > +#define QSERDES_V4_RX_RX_OFFSET_ADAPTOR_CNTRL2 0x114 > +#define QSERDES_V4_RX_RX_IDAC_MEASURE_TIME 0x100 > +#define QSERDES_V4_RX_RX_IDAC_TSETTLE_LOW 0x0F8 > +#define QSERDES_V4_RX_RX_IDAC_TSETTLE_HIGH 0x0FC > +#define QSERDES_V4_RX_RX_MODE_00_LOW 0x170 > +#define QSERDES_V4_RX_RX_MODE_00_HIGH 0x174 > +#define QSERDES_V4_RX_RX_MODE_00_HIGH2 0x178 > +#define QSERDES_V4_RX_RX_MODE_00_HIGH3 0x17C > +#define QSERDES_V4_RX_RX_MODE_00_HIGH4 0x180 > +#define QSERDES_V4_RX_RX_MODE_01_LOW 0x184 > +#define QSERDES_V4_RX_RX_MODE_01_HIGH 0x188 > +#define QSERDES_V4_RX_RX_MODE_01_HIGH2 0x18C > +#define QSERDES_V4_RX_RX_MODE_01_HIGH3 0x190 > +#define QSERDES_V4_RX_RX_MODE_01_HIGH4 0x194 > +#define QSERDES_V4_RX_RX_MODE_10_LOW 0x198 > +#define QSERDES_V4_RX_RX_MODE_10_HIGH 0x19C > +#define QSERDES_V4_RX_RX_MODE_10_HIGH2 0x1A0 > +#define QSERDES_V4_RX_RX_MODE_10_HIGH3 0x1A4 > +#define QSERDES_V4_RX_RX_MODE_10_HIGH4 0x1A8 > +#define QSERDES_V4_RX_DCC_CTRL1 0x1BC > +#define QSERDES_V4_RX_AC_JTAG_ENABLE 0x068 > +#define QSERDES_V4_RX_UCDR_FO_GAIN 0x008 > +#define QSERDES_V4_RX_UCDR_SO_GAIN 0x014 > +#define QSERDES_V4_RX_AC_JTAG_MODE 0x078 > + > +/* Only for QMP V4 PHY - PCS registers */ > +#define QPHY_V4_PHY_START 0x000 > +#define QPHY_V4_POWER_DOWN_CONTROL 0x004 > +#define QPHY_V4_SW_RESET 0x008 > +#define QPHY_V4_PCS_READY_STATUS 0x180 > +#define QPHY_V4_LINECFG_DISABLE 0x148 > +#define QPHY_V4_MULTI_LANE_CTRL1 0x1E0 > +#define QPHY_V4_RX_SIGDET_CTRL2 0x158 > +#define QPHY_V4_TX_LARGE_AMP_DRV_LVL 0x030 > +#define QPHY_V4_TX_SMALL_AMP_DRV_LVL 0x038 > +#define QPHY_V4_TX_MID_TERM_CTRL1 0x1D8 > +#define QPHY_V4_DEBUG_BUS_CLKSEL 0x124 > +#define QPHY_V4_PLL_CNTL 0x02C > +#define QPHY_V4_TIMER_20US_CORECLK_STEPS_MSB 0x00C > +#define QPHY_V4_TIMER_20US_CORECLK_STEPS_LSB 0x010 > +#define QPHY_V4_TX_PWM_GEAR_BAND 0x160 > +#define QPHY_V4_TX_HS_GEAR_BAND 0x168 > +#define QPHY_V4_TX_HSGEAR_CAPABILITY 0x074 > +#define QPHY_V4_RX_HSGEAR_CAPABILITY 0x0B4 > +#define QPHY_V4_RX_MIN_HIBERN8_TIME 0x150 > +#define QPHY_V4_BIST_FIXED_PAT_CTRL 0x060 > + > #endif > -- > 2.20.1 > ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support 2019-09-04 10:08 ` [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support Vinod Koul 2019-09-04 18:52 ` Bjorn Andersson @ 2019-09-04 23:23 ` Stephen Boyd 2019-09-06 4:18 ` Vinod Koul 1 sibling, 1 reply; 11+ messages in thread From: Stephen Boyd @ 2019-09-04 23:23 UTC (permalink / raw) To: Kishon Vijay Abraham I, Vinod Koul Cc: linux-arm-msm, Bjorn Andersson, Vinod Koul, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree Quoting Vinod Koul (2019-09-04 03:08:35) > @@ -878,6 +883,93 @@ static const struct qmp_phy_init_tbl msm8998_usb3_pcs_tbl[] = { > QMP_PHY_INIT_CFG(QPHY_V3_PCS_RXEQTRAINING_RUN_TIME, 0x13), > }; > > +static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = { > + QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_SYSCLK_EN_SEL, 0xD9), Can you use lowercase hex? > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_SEL, 0x11), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_HS_SWITCH_SEL, 0x00), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP_EN, 0x01), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_MAP, 0x02), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_IVCO, 0x0F), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_INITVAL2, 0x00), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_HSCLK_SEL, 0x11), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_DEC_START_MODE0, 0x82), > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_CP_CTRL_MODE0, 0x06), Gotta love the pile of numbers and register writes... ^ permalink raw reply [flat|nested] 11+ messages in thread
* Re: [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support 2019-09-04 23:23 ` Stephen Boyd @ 2019-09-06 4:18 ` Vinod Koul 0 siblings, 0 replies; 11+ messages in thread From: Vinod Koul @ 2019-09-06 4:18 UTC (permalink / raw) To: Stephen Boyd Cc: Kishon Vijay Abraham I, linux-arm-msm, Bjorn Andersson, Andy Gross, Rob Herring, Mark Rutland, linux-kernel, devicetree On 04-09-19, 16:23, Stephen Boyd wrote: > Quoting Vinod Koul (2019-09-04 03:08:35) > > @@ -878,6 +883,93 @@ static const struct qmp_phy_init_tbl msm8998_usb3_pcs_tbl[] = { > > QMP_PHY_INIT_CFG(QPHY_V3_PCS_RXEQTRAINING_RUN_TIME, 0x13), > > }; > > > > +static const struct qmp_phy_init_tbl sm8150_ufsphy_serdes_tbl[] = { > > + QMP_PHY_INIT_CFG(QPHY_POWER_DOWN_CONTROL, 0x01), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_SYSCLK_EN_SEL, 0xD9), > > Can you use lowercase hex? Sure will update > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_SEL, 0x11), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_HSCLK_HS_SWITCH_SEL, 0x00), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_LOCK_CMP_EN, 0x01), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_MAP, 0x02), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_PLL_IVCO, 0x0F), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_VCO_TUNE_INITVAL2, 0x00), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_BIN_VCOCAL_HSCLK_SEL, 0x11), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_DEC_START_MODE0, 0x82), > > + QMP_PHY_INIT_CFG(QSERDES_COM_V4_CP_CTRL_MODE0, 0x06), > > Gotta love the pile of numbers and register writes... :D -- ~Vinod ^ permalink raw reply [flat|nested] 11+ messages in thread
end of thread, other threads:[~2019-09-06 4:19 UTC | newest] Thread overview: 11+ messages (download: mbox.gz / follow: Atom feed) -- links below jump to the message on this page -- 2019-09-04 10:08 [PATCH 0/3] UFS: Add support for SM8150 UFS Vinod Koul 2019-09-04 10:08 ` [PATCH 1/3] dt-bindings: ufs: Add sm8150 compatible string Vinod Koul 2019-09-04 18:49 ` Bjorn Andersson 2019-09-04 23:21 ` Stephen Boyd 2019-09-04 10:08 ` [PATCH 2/3] dt-bindings: phy-qcom-qmp: Add sm8150 UFS phy " Vinod Koul 2019-09-04 18:49 ` Bjorn Andersson 2019-09-04 23:21 ` Stephen Boyd 2019-09-04 10:08 ` [PATCH 3/3] phy: qcom-qmp: Add SM8150 QMP UFS PHY support Vinod Koul 2019-09-04 18:52 ` Bjorn Andersson 2019-09-04 23:23 ` Stephen Boyd 2019-09-06 4:18 ` Vinod Koul
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).