* [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845
@ 2018-03-20 11:30 Can Guo
2018-03-20 11:30 ` [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845 Can Guo
` (2 more replies)
0 siblings, 3 replies; 7+ messages in thread
From: Can Guo @ 2018-03-20 11:30 UTC (permalink / raw)
To: subhashj, asutoshd, vivek.gautam, mgautam, kishon; +Cc: linux-kernel, Can Guo
This patch series adds support for UFS QMP PHY on SDM845 and updates the
compitable string for it.
Can Guo (2):
phy: Add QMP phy based UFS phy support for sdm845
dt-bindings: phy-qcom-qmp: Update UFS phy compitable string for sdm845
.../devicetree/bindings/phy/qcom-qmp-phy.txt | 3 +-
drivers/phy/qualcomm/phy-qcom-qmp.c | 120 ++++++++++++++++++++-
drivers/phy/qualcomm/phy-qcom-qmp.h | 8 ++
3 files changed, 128 insertions(+), 3 deletions(-)
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 7+ messages in thread
* [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845
2018-03-20 11:30 [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845 Can Guo
@ 2018-03-20 11:30 ` Can Guo
2018-03-21 2:42 ` cang
2018-03-20 11:30 ` [PATCH v1 2/2] dt-bindings: phy-qcom-qmp: Update UFS phy binding " Can Guo
2018-03-21 2:42 ` [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845 cang
2 siblings, 1 reply; 7+ messages in thread
From: Can Guo @ 2018-03-20 11:30 UTC (permalink / raw)
To: subhashj, asutoshd, vivek.gautam, mgautam, kishon; +Cc: linux-kernel, Can Guo
Add UFS PHY support to make SDM845 UFS work with common PHY framework.
Signed-off-by: Can Guo <cang@codeaurora.org>
---
drivers/phy/qualcomm/phy-qcom-qmp.c | 120 +++++++++++++++++++++++++++++++++++-
drivers/phy/qualcomm/phy-qcom-qmp.h | 8 +++
2 files changed, 126 insertions(+), 2 deletions(-)
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c b/drivers/phy/qualcomm/phy-qcom-qmp.c
index 6470c5d..aeb2377 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.c
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
@@ -156,6 +156,11 @@ enum qphy_reg_layout {
[QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170,
};
+static const unsigned int sdm845_ufsphy_regs_layout[] = {
+ [QPHY_START_CTRL] = 0x00,
+ [QPHY_PCS_READY_STATUS] = 0x168,
+};
+
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),
@@ -490,6 +495,74 @@ enum qphy_reg_layout {
QMP_PHY_INIT_CFG(QPHY_V3_PCS_RXEQTRAINING_RUN_TIME, 0x13),
};
+static const struct qmp_phy_init_tbl sdm845_ufsphy_serdes_tbl[] = {
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYS_CLK_CTRL, 0x02),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_BG_TIMER, 0x0a),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_IVCO, 0x0f),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_CMN_CONFIG, 0x06),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_EN_SEL, 0xd5),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_RESETSM_CNTRL, 0x20),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_HSCLK_SEL, 0x00),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP_EN, 0x01),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_CTRL, 0x00),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_CORE_CLK_EN, 0x00),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x04),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_SVS_MODE_CLK_SEL, 0x05),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_INITVAL1, 0xff),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_INITVAL2, 0x00),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE0, 0x82),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE0, 0x06),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE0, 0x16),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE0, 0x36),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE0, 0x3f),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE0, 0x00),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE0, 0xda),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE0, 0x01),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE0, 0xff),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE0, 0x0c),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE1, 0x98),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE1, 0x06),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE1, 0x16),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE1, 0x36),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE1, 0x3f),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE1, 0x00),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE1, 0xc1),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE1, 0x00),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE1, 0x32),
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE1, 0x0f),
+
+ /* Rate B */
+ QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x44),
+};
+
+static const struct qmp_phy_init_tbl sdm845_ufsphy_tx_tbl[] = {
+ QMP_PHY_INIT_CFG(QSERDES_V3_TX_LANE_MODE_1, 0x06),
+};
+
+static const struct qmp_phy_init_tbl sdm845_ufsphy_rx_tbl[] = {
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_LVL, 0x24),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_CNTRL, 0x0f),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_DEGLITCH_CNTRL, 0x1e),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_INTERFACE_MODE, 0x40),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN, 0x0b),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_TERM_BW, 0x5b),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL2, 0x06),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL3, 0x04),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL4, 0x1d),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN_HALF, 0x04),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN_QUARTER, 0x04),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN, 0x04),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4b),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_PI_CONTROLS, 0x81),
+ QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW, 0x80),
+};
+
+static const struct qmp_phy_init_tbl sdm845_ufsphy_pcs_tbl[] = {
+ QMP_PHY_INIT_CFG(QPHY_V3_PCS_POWER_DOWN_CONTROL, 0x01),
+ QMP_PHY_INIT_CFG(QPHY_V3_PCS_MULTI_LANE_CTRL1, 0x02),
+};
+
/* struct qmp_phy_cfg - per-PHY initialization config */
struct qmp_phy_cfg {
/* phy-type - PCIE/UFS/USB */
@@ -540,6 +613,9 @@ struct qmp_phy_cfg {
/* Register offset of secondary tx/rx lanes for USB DP combo PHY */
unsigned int tx_b_lane_offset;
unsigned int rx_b_lane_offset;
+
+ /* true, if PCS block has a separate SW_RESET register */
+ bool has_sw_rst;
};
/**
@@ -636,6 +712,10 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val)
"aux", "cfg_ahb", "ref", "com_aux",
};
+static const char * const sdm845_ufs_phy_clk_l[] = {
+ "ref_clk", "ref_aux_clk",
+};
+
/* list of resets */
static const char * const msm8996_pciephy_reset_l[] = {
"phy", "common", "cfg",
@@ -650,6 +730,10 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val)
"vdda-phy", "vdda-pll",
};
+static const char * const sdm845_phy_vreg_l[] = {
+ "vdda-phy", "vdda-pll",
+};
+
static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
.type = PHY_TYPE_PCIE,
.nlanes = 3,
@@ -679,6 +763,7 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val)
.has_pwrdn_delay = true,
.pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN,
.pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX,
+ .has_sw_rst = true,
};
static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {
@@ -704,6 +789,7 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val)
.start_ctrl = SERDES_START | PCS_START,
.pwrdn_ctrl = SW_PWRDN,
.mask_pcs_ready = PHYSTATUS,
+ .has_sw_rst = true,
};
/* list of resets */
@@ -740,6 +826,7 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val)
.has_pwrdn_delay = true,
.pwrdn_delay_min = 995, /* us */
.pwrdn_delay_max = 1005, /* us */
+ .has_sw_rst = true,
};
static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = {
@@ -772,6 +859,30 @@ static inline void qphy_clrbits(void __iomem *base, u32 offset, u32 val)
.has_phy_dp_com_ctrl = true,
.tx_b_lane_offset = 0x400,
.rx_b_lane_offset = 0x400,
+ .has_sw_rst = true,
+};
+
+static const struct qmp_phy_cfg sdm845_ufsphy_cfg = {
+ .type = PHY_TYPE_UFS,
+ .nlanes = 2,
+
+ .serdes_tbl = sdm845_ufsphy_serdes_tbl,
+ .serdes_tbl_num = ARRAY_SIZE(sdm845_ufsphy_serdes_tbl),
+ .tx_tbl = sdm845_ufsphy_tx_tbl,
+ .tx_tbl_num = ARRAY_SIZE(sdm845_ufsphy_tx_tbl),
+ .rx_tbl = sdm845_ufsphy_rx_tbl,
+ .rx_tbl_num = ARRAY_SIZE(sdm845_ufsphy_rx_tbl),
+ .pcs_tbl = sdm845_ufsphy_pcs_tbl,
+ .pcs_tbl_num = ARRAY_SIZE(sdm845_ufsphy_pcs_tbl),
+ .clk_list = sdm845_ufs_phy_clk_l,
+ .num_clks = ARRAY_SIZE(sdm845_ufs_phy_clk_l),
+ .vreg_list = sdm845_phy_vreg_l,
+ .num_vregs = ARRAY_SIZE(sdm845_phy_vreg_l),
+ .regs = sdm845_ufsphy_regs_layout,
+
+ .start_ctrl = SERDES_START,
+ .pwrdn_ctrl = SW_PWRDN,
+ .mask_pcs_ready = PCS_READY,
};
static void qcom_qmp_phy_configure(void __iomem *base,
@@ -998,7 +1109,8 @@ static int qcom_qmp_phy_init(struct phy *phy)
usleep_range(cfg->pwrdn_delay_min, cfg->pwrdn_delay_max);
/* Pull PHY out of reset state */
- qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+ if (cfg->has_sw_rst)
+ qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
if (cfg->has_phy_dp_com_ctrl)
qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
@@ -1036,7 +1148,8 @@ static int qcom_qmp_phy_exit(struct phy *phy)
clk_disable_unprepare(qphy->pipe_clk);
/* PHY reset */
- qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
+ if (cfg->has_sw_rst)
+ qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
/* stop SerDes and Phy-Coding-Sublayer */
qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
@@ -1383,6 +1496,9 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)
}, {
.compatible = "qcom,qmp-v3-usb3-phy",
.data = &qmp_v3_usb3phy_cfg,
+ }, {
+ .compatible = "qcom,sdm845-qmp-ufs-phy",
+ .data = &sdm845_ufsphy_cfg,
},
{ },
};
diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.h b/drivers/phy/qualcomm/phy-qcom-qmp.h
index d1c6905..ea4b4dc 100644
--- a/drivers/phy/qualcomm/phy-qcom-qmp.h
+++ b/drivers/phy/qualcomm/phy-qcom-qmp.h
@@ -184,6 +184,8 @@
#define QSERDES_V3_COM_VCO_TUNE2_MODE0 0x0f8
#define QSERDES_V3_COM_VCO_TUNE1_MODE1 0x0fc
#define QSERDES_V3_COM_VCO_TUNE2_MODE1 0x100
+#define QSERDES_V3_COM_VCO_TUNE_INITVAL1 0x104
+#define QSERDES_V3_COM_VCO_TUNE_INITVAL2 0x108
#define QSERDES_V3_COM_VCO_TUNE_TIMER1 0x11c
#define QSERDES_V3_COM_VCO_TUNE_TIMER2 0x120
#define QSERDES_V3_COM_CLK_SELECT 0x138
@@ -211,8 +213,13 @@
/* Only for QMP V3 PHY - RX registers */
#define QSERDES_V3_RX_UCDR_SO_GAIN_HALF 0x00c
#define QSERDES_V3_RX_UCDR_SO_GAIN 0x014
+#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_HALF 0x024
+#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_QUARTER 0x028
+#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN 0x02c
#define QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN 0x030
#define QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE 0x034
+#define QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW 0x03c
+#define QSERDES_V3_RX_UCDR_PI_CONTROLS 0x044
#define QSERDES_V3_RX_RX_TERM_BW 0x07c
#define QSERDES_V3_RX_RX_EQ_GAIN2_LSB 0x0c8
#define QSERDES_V3_RX_RX_EQ_GAIN2_MSB 0x0cc
@@ -272,6 +279,7 @@
#define QPHY_V3_PCS_FLL_CNT_VAL_L 0x0cc
#define QPHY_V3_PCS_FLL_CNT_VAL_H_TOL 0x0d0
#define QPHY_V3_PCS_FLL_MAN_CODE 0x0d4
+#define QPHY_V3_PCS_MULTI_LANE_CTRL1 0x1c4
#define QPHY_V3_PCS_RX_SIGDET_LVL 0x1d8
/* Only for QMP V3 PHY - PCS_MISC registers */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 7+ messages in thread
* [PATCH v1 2/2] dt-bindings: phy-qcom-qmp: Update UFS phy binding for sdm845
2018-03-20 11:30 [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845 Can Guo
2018-03-20 11:30 ` [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845 Can Guo
@ 2018-03-20 11:30 ` Can Guo
2018-03-21 2:39 ` cang
2018-03-21 2:42 ` [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845 cang
2 siblings, 1 reply; 7+ messages in thread
From: Can Guo @ 2018-03-20 11:30 UTC (permalink / raw)
To: subhashj, asutoshd, vivek.gautam, mgautam, kishon; +Cc: linux-kernel, Can Guo
Update the compatible string for UFS QMP PHY on SDM845.
Signed-off-by: Can Guo <cang@codeaurora.org>
---
Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt | 3 ++-
1 file changed, 2 insertions(+), 1 deletion(-)
diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
index cef8765..6e68a6d 100644
--- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
+++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
@@ -11,7 +11,8 @@ Required properties:
"qcom,msm8996-qmp-usb3-phy" for 14nm USB3 phy on msm8996,
"qcom,qmp-v3-usb3-phy" for USB3 QMP V3 phy,
"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-usb3-uni-phy" for USB3 QMP V3 UNI phy on sdm845,
+ "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845.
- reg: offset and length of register set for PHY's common serdes block.
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply related [flat|nested] 7+ messages in thread
* Re: [PATCH v1 2/2] dt-bindings: phy-qcom-qmp: Update UFS phy binding for sdm845
2018-03-20 11:30 ` [PATCH v1 2/2] dt-bindings: phy-qcom-qmp: Update UFS phy binding " Can Guo
@ 2018-03-21 2:39 ` cang
0 siblings, 0 replies; 7+ messages in thread
From: cang @ 2018-03-21 2:39 UTC (permalink / raw)
To: subhashj, asutoshd, vivek.gautam, mgautam, kishon, robh+dt,
mark.rutland
Cc: linux-kernel, devicetree
On 2018-03-20 19:30, Can Guo wrote:
> Update the compatible string for UFS QMP PHY on SDM845.
>
> Signed-off-by: Can Guo <cang@codeaurora.org>
> ---
> Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt | 3 ++-
> 1 file changed, 2 insertions(+), 1 deletion(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
> b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
> index cef8765..6e68a6d 100644
> --- a/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
> +++ b/Documentation/devicetree/bindings/phy/qcom-qmp-phy.txt
> @@ -11,7 +11,8 @@ Required properties:
> "qcom,msm8996-qmp-usb3-phy" for 14nm USB3 phy on msm8996,
> "qcom,qmp-v3-usb3-phy" for USB3 QMP V3 phy,
> "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-usb3-uni-phy" for USB3 QMP V3 UNI phy on
> sdm845,
> + "qcom,sdm845-qmp-ufs-phy" for UFS QMP phy on sdm845.
>
> - reg: offset and length of register set for PHY's common serdes
> block.
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845
2018-03-20 11:30 [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845 Can Guo
2018-03-20 11:30 ` [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845 Can Guo
2018-03-20 11:30 ` [PATCH v1 2/2] dt-bindings: phy-qcom-qmp: Update UFS phy binding " Can Guo
@ 2018-03-21 2:42 ` cang
2 siblings, 0 replies; 7+ messages in thread
From: cang @ 2018-03-21 2:42 UTC (permalink / raw)
To: subhashj, asutoshd, vivek.gautam, mgautam, kishon, robh+dt,
mark.rutland
Cc: linux-kernel, devicetree
On 2018-03-20 19:30, Can Guo wrote:
> This patch series adds support for UFS QMP PHY on SDM845 and updates
> the
> compitable string for it.
>
> Can Guo (2):
> phy: Add QMP phy based UFS phy support for sdm845
> dt-bindings: phy-qcom-qmp: Update UFS phy compitable string for
> sdm845
>
> .../devicetree/bindings/phy/qcom-qmp-phy.txt | 3 +-
> drivers/phy/qualcomm/phy-qcom-qmp.c | 120
> ++++++++++++++++++++-
> drivers/phy/qualcomm/phy-qcom-qmp.h | 8 ++
> 3 files changed, 128 insertions(+), 3 deletions(-)
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845
2018-03-20 11:30 ` [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845 Can Guo
@ 2018-03-21 2:42 ` cang
2018-03-21 3:34 ` Manu Gautam
0 siblings, 1 reply; 7+ messages in thread
From: cang @ 2018-03-21 2:42 UTC (permalink / raw)
To: subhashj, asutoshd, vivek.gautam, mgautam, kishon, robh+dt,
mark.rutland
Cc: linux-kernel, devicetree
On 2018-03-20 19:30, Can Guo wrote:
> Add UFS PHY support to make SDM845 UFS work with common PHY framework.
>
> Signed-off-by: Can Guo <cang@codeaurora.org>
> ---
> drivers/phy/qualcomm/phy-qcom-qmp.c | 120
> +++++++++++++++++++++++++++++++++++-
> drivers/phy/qualcomm/phy-qcom-qmp.h | 8 +++
> 2 files changed, 126 insertions(+), 2 deletions(-)
>
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.c
> b/drivers/phy/qualcomm/phy-qcom-qmp.c
> index 6470c5d..aeb2377 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.c
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.c
> @@ -156,6 +156,11 @@ enum qphy_reg_layout {
> [QPHY_PCS_LFPS_RXTERM_IRQ_STATUS] = 0x170,
> };
>
> +static const unsigned int sdm845_ufsphy_regs_layout[] = {
> + [QPHY_START_CTRL] = 0x00,
> + [QPHY_PCS_READY_STATUS] = 0x168,
> +};
> +
> 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),
> @@ -490,6 +495,74 @@ enum qphy_reg_layout {
> QMP_PHY_INIT_CFG(QPHY_V3_PCS_RXEQTRAINING_RUN_TIME, 0x13),
> };
>
> +static const struct qmp_phy_init_tbl sdm845_ufsphy_serdes_tbl[] = {
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYS_CLK_CTRL, 0x02),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_BG_TIMER, 0x0a),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_IVCO, 0x0f),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_CMN_CONFIG, 0x06),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_SYSCLK_EN_SEL, 0xd5),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_RESETSM_CNTRL, 0x20),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_CLK_SELECT, 0x30),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_HSCLK_SEL, 0x00),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP_EN, 0x01),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_CTRL, 0x00),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_CORE_CLK_EN, 0x00),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x04),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_SVS_MODE_CLK_SEL, 0x05),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_INITVAL1, 0xff),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_INITVAL2, 0x00),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE0, 0x82),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE0, 0x06),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE0, 0x16),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE0, 0x36),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE0, 0x3f),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE0, 0x00),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE0, 0xda),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE0, 0x01),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE0, 0xff),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE0, 0x0c),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_DEC_START_MODE1, 0x98),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_CP_CTRL_MODE1, 0x06),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_RCTRL_MODE1, 0x16),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_PLL_CCTRL_MODE1, 0x36),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN0_MODE1, 0x3f),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_INTEGLOOP_GAIN1_MODE1, 0x00),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE1_MODE1, 0xc1),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE2_MODE1, 0x00),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP1_MODE1, 0x32),
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_LOCK_CMP2_MODE1, 0x0f),
> +
> + /* Rate B */
> + QMP_PHY_INIT_CFG(QSERDES_V3_COM_VCO_TUNE_MAP, 0x44),
> +};
> +
> +static const struct qmp_phy_init_tbl sdm845_ufsphy_tx_tbl[] = {
> + QMP_PHY_INIT_CFG(QSERDES_V3_TX_LANE_MODE_1, 0x06),
> +};
> +
> +static const struct qmp_phy_init_tbl sdm845_ufsphy_rx_tbl[] = {
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_LVL, 0x24),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_CNTRL, 0x0f),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_SIGDET_DEGLITCH_CNTRL, 0x1e),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_INTERFACE_MODE, 0x40),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN, 0x0b),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_TERM_BW, 0x5b),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL2, 0x06),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL3, 0x04),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_RX_EQU_ADAPTOR_CNTRL4, 0x1d),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN_HALF, 0x04),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN_QUARTER, 0x04),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SVS_SO_GAIN, 0x04),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE, 0x4b),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_PI_CONTROLS, 0x81),
> + QMP_PHY_INIT_CFG(QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW, 0x80),
> +};
> +
> +static const struct qmp_phy_init_tbl sdm845_ufsphy_pcs_tbl[] = {
> + QMP_PHY_INIT_CFG(QPHY_V3_PCS_POWER_DOWN_CONTROL, 0x01),
> + QMP_PHY_INIT_CFG(QPHY_V3_PCS_MULTI_LANE_CTRL1, 0x02),
> +};
> +
> /* struct qmp_phy_cfg - per-PHY initialization config */
> struct qmp_phy_cfg {
> /* phy-type - PCIE/UFS/USB */
> @@ -540,6 +613,9 @@ struct qmp_phy_cfg {
> /* Register offset of secondary tx/rx lanes for USB DP combo PHY */
> unsigned int tx_b_lane_offset;
> unsigned int rx_b_lane_offset;
> +
> + /* true, if PCS block has a separate SW_RESET register */
> + bool has_sw_rst;
> };
>
> /**
> @@ -636,6 +712,10 @@ static inline void qphy_clrbits(void __iomem
> *base, u32 offset, u32 val)
> "aux", "cfg_ahb", "ref", "com_aux",
> };
>
> +static const char * const sdm845_ufs_phy_clk_l[] = {
> + "ref_clk", "ref_aux_clk",
> +};
> +
> /* list of resets */
> static const char * const msm8996_pciephy_reset_l[] = {
> "phy", "common", "cfg",
> @@ -650,6 +730,10 @@ static inline void qphy_clrbits(void __iomem
> *base, u32 offset, u32 val)
> "vdda-phy", "vdda-pll",
> };
>
> +static const char * const sdm845_phy_vreg_l[] = {
> + "vdda-phy", "vdda-pll",
> +};
> +
> static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
> .type = PHY_TYPE_PCIE,
> .nlanes = 3,
> @@ -679,6 +763,7 @@ static inline void qphy_clrbits(void __iomem
> *base, u32 offset, u32 val)
> .has_pwrdn_delay = true,
> .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN,
> .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX,
> + .has_sw_rst = true,
> };
>
> static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {
> @@ -704,6 +789,7 @@ static inline void qphy_clrbits(void __iomem
> *base, u32 offset, u32 val)
> .start_ctrl = SERDES_START | PCS_START,
> .pwrdn_ctrl = SW_PWRDN,
> .mask_pcs_ready = PHYSTATUS,
> + .has_sw_rst = true,
> };
>
> /* list of resets */
> @@ -740,6 +826,7 @@ static inline void qphy_clrbits(void __iomem
> *base, u32 offset, u32 val)
> .has_pwrdn_delay = true,
> .pwrdn_delay_min = 995, /* us */
> .pwrdn_delay_max = 1005, /* us */
> + .has_sw_rst = true,
> };
>
> static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = {
> @@ -772,6 +859,30 @@ static inline void qphy_clrbits(void __iomem
> *base, u32 offset, u32 val)
> .has_phy_dp_com_ctrl = true,
> .tx_b_lane_offset = 0x400,
> .rx_b_lane_offset = 0x400,
> + .has_sw_rst = true,
> +};
> +
> +static const struct qmp_phy_cfg sdm845_ufsphy_cfg = {
> + .type = PHY_TYPE_UFS,
> + .nlanes = 2,
> +
> + .serdes_tbl = sdm845_ufsphy_serdes_tbl,
> + .serdes_tbl_num = ARRAY_SIZE(sdm845_ufsphy_serdes_tbl),
> + .tx_tbl = sdm845_ufsphy_tx_tbl,
> + .tx_tbl_num = ARRAY_SIZE(sdm845_ufsphy_tx_tbl),
> + .rx_tbl = sdm845_ufsphy_rx_tbl,
> + .rx_tbl_num = ARRAY_SIZE(sdm845_ufsphy_rx_tbl),
> + .pcs_tbl = sdm845_ufsphy_pcs_tbl,
> + .pcs_tbl_num = ARRAY_SIZE(sdm845_ufsphy_pcs_tbl),
> + .clk_list = sdm845_ufs_phy_clk_l,
> + .num_clks = ARRAY_SIZE(sdm845_ufs_phy_clk_l),
> + .vreg_list = sdm845_phy_vreg_l,
> + .num_vregs = ARRAY_SIZE(sdm845_phy_vreg_l),
> + .regs = sdm845_ufsphy_regs_layout,
> +
> + .start_ctrl = SERDES_START,
> + .pwrdn_ctrl = SW_PWRDN,
> + .mask_pcs_ready = PCS_READY,
> };
>
> static void qcom_qmp_phy_configure(void __iomem *base,
> @@ -998,7 +1109,8 @@ static int qcom_qmp_phy_init(struct phy *phy)
> usleep_range(cfg->pwrdn_delay_min, cfg->pwrdn_delay_max);
>
> /* Pull PHY out of reset state */
> - qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
> + if (cfg->has_sw_rst)
> + qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
> if (cfg->has_phy_dp_com_ctrl)
> qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
>
> @@ -1036,7 +1148,8 @@ static int qcom_qmp_phy_exit(struct phy *phy)
> clk_disable_unprepare(qphy->pipe_clk);
>
> /* PHY reset */
> - qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
> + if (cfg->has_sw_rst)
> + qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
>
> /* stop SerDes and Phy-Coding-Sublayer */
> qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
> @@ -1383,6 +1496,9 @@ int qcom_qmp_phy_create(struct device *dev,
> struct device_node *np, int id)
> }, {
> .compatible = "qcom,qmp-v3-usb3-phy",
> .data = &qmp_v3_usb3phy_cfg,
> + }, {
> + .compatible = "qcom,sdm845-qmp-ufs-phy",
> + .data = &sdm845_ufsphy_cfg,
> },
> { },
> };
> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.h
> b/drivers/phy/qualcomm/phy-qcom-qmp.h
> index d1c6905..ea4b4dc 100644
> --- a/drivers/phy/qualcomm/phy-qcom-qmp.h
> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.h
> @@ -184,6 +184,8 @@
> #define QSERDES_V3_COM_VCO_TUNE2_MODE0 0x0f8
> #define QSERDES_V3_COM_VCO_TUNE1_MODE1 0x0fc
> #define QSERDES_V3_COM_VCO_TUNE2_MODE1 0x100
> +#define QSERDES_V3_COM_VCO_TUNE_INITVAL1 0x104
> +#define QSERDES_V3_COM_VCO_TUNE_INITVAL2 0x108
> #define QSERDES_V3_COM_VCO_TUNE_TIMER1 0x11c
> #define QSERDES_V3_COM_VCO_TUNE_TIMER2 0x120
> #define QSERDES_V3_COM_CLK_SELECT 0x138
> @@ -211,8 +213,13 @@
> /* Only for QMP V3 PHY - RX registers */
> #define QSERDES_V3_RX_UCDR_SO_GAIN_HALF 0x00c
> #define QSERDES_V3_RX_UCDR_SO_GAIN 0x014
> +#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_HALF 0x024
> +#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_QUARTER 0x028
> +#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN 0x02c
> #define QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN 0x030
> #define QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE 0x034
> +#define QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW 0x03c
> +#define QSERDES_V3_RX_UCDR_PI_CONTROLS 0x044
> #define QSERDES_V3_RX_RX_TERM_BW 0x07c
> #define QSERDES_V3_RX_RX_EQ_GAIN2_LSB 0x0c8
> #define QSERDES_V3_RX_RX_EQ_GAIN2_MSB 0x0cc
> @@ -272,6 +279,7 @@
> #define QPHY_V3_PCS_FLL_CNT_VAL_L 0x0cc
> #define QPHY_V3_PCS_FLL_CNT_VAL_H_TOL 0x0d0
> #define QPHY_V3_PCS_FLL_MAN_CODE 0x0d4
> +#define QPHY_V3_PCS_MULTI_LANE_CTRL1 0x1c4
> #define QPHY_V3_PCS_RX_SIGDET_LVL 0x1d8
>
> /* Only for QMP V3 PHY - PCS_MISC registers */
^ permalink raw reply [flat|nested] 7+ messages in thread
* Re: [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845
2018-03-21 2:42 ` cang
@ 2018-03-21 3:34 ` Manu Gautam
0 siblings, 0 replies; 7+ messages in thread
From: Manu Gautam @ 2018-03-21 3:34 UTC (permalink / raw)
To: cang, subhashj, asutoshd, vivek.gautam, kishon, robh+dt,
mark.rutland
Cc: linux-kernel, devicetree
Hi Can,
On 3/21/2018 8:12 AM, cang@codeaurora.org wrote:
> On 2018-03-20 19:30, Can Guo wrote:
>> Add UFS PHY support to make SDM845 UFS work with common PHY framework.
>>
>> Signed-off-by: Can Guo <cang@codeaurora.org>
>> ---
>> drivers/phy/qualcomm/phy-qcom-qmp.c | 120 +++++++++++++++++++++++++++++++++++-
>> drivers/phy/qualcomm/phy-qcom-qmp.h | 8 +++
>> 2 files changed, 126 insertions(+), 2 deletions(-)
>>
[snip]
>> + /* true, if PCS block has a separate SW_RESET register */
>> + bool has_sw_rst;
>> };
>>
You should set this for qmp_v3_usb3_uniphy_cfg as well.
Please also mention dependency on my patches [1] and [2] in your cover letter
[1] http://lists-archives.com/linux-kernel/29071659-dt-bindings-phy-qcom-qmp-update-bindings-for-sdm845.html
[2] lists-archives.com/linux-kernel/29071660-phy-qcom-qmp-add-qmp-v3-usb3-uni-phy-support-for-sdm845.html
>> /**
>> @@ -636,6 +712,10 @@ static inline void qphy_clrbits(void __iomem
>> *base, u32 offset, u32 val)
>> "aux", "cfg_ahb", "ref", "com_aux",
>> };
>>
>> +static const char * const sdm845_ufs_phy_clk_l[] = {
>> + "ref_clk", "ref_aux_clk",
>> +};
>> +
>> /* list of resets */
>> static const char * const msm8996_pciephy_reset_l[] = {
>> "phy", "common", "cfg",
>> @@ -650,6 +730,10 @@ static inline void qphy_clrbits(void __iomem
>> *base, u32 offset, u32 val)
>> "vdda-phy", "vdda-pll",
>> };
>>
>> +static const char * const sdm845_phy_vreg_l[] = {
>> + "vdda-phy", "vdda-pll",
>> +};
>> +
>> static const struct qmp_phy_cfg msm8996_pciephy_cfg = {
>> .type = PHY_TYPE_PCIE,
>> .nlanes = 3,
>> @@ -679,6 +763,7 @@ static inline void qphy_clrbits(void __iomem
>> *base, u32 offset, u32 val)
>> .has_pwrdn_delay = true,
>> .pwrdn_delay_min = POWER_DOWN_DELAY_US_MIN,
>> .pwrdn_delay_max = POWER_DOWN_DELAY_US_MAX,
>> + .has_sw_rst = true,
>> };
>>
>> static const struct qmp_phy_cfg msm8996_usb3phy_cfg = {
>> @@ -704,6 +789,7 @@ static inline void qphy_clrbits(void __iomem
>> *base, u32 offset, u32 val)
>> .start_ctrl = SERDES_START | PCS_START,
>> .pwrdn_ctrl = SW_PWRDN,
>> .mask_pcs_ready = PHYSTATUS,
>> + .has_sw_rst = true,
>> };
>>
>> /* list of resets */
>> @@ -740,6 +826,7 @@ static inline void qphy_clrbits(void __iomem
>> *base, u32 offset, u32 val)
>> .has_pwrdn_delay = true,
>> .pwrdn_delay_min = 995, /* us */
>> .pwrdn_delay_max = 1005, /* us */
>> + .has_sw_rst = true,
>> };
>>
>> static const struct qmp_phy_cfg qmp_v3_usb3phy_cfg = {
>> @@ -772,6 +859,30 @@ static inline void qphy_clrbits(void __iomem
>> *base, u32 offset, u32 val)
>> .has_phy_dp_com_ctrl = true,
>> .tx_b_lane_offset = 0x400,
>> .rx_b_lane_offset = 0x400,
>> + .has_sw_rst = true,
>> +};
>> +
>> +static const struct qmp_phy_cfg sdm845_ufsphy_cfg = {
>> + .type = PHY_TYPE_UFS,
>> + .nlanes = 2,
>> +
>> + .serdes_tbl = sdm845_ufsphy_serdes_tbl,
>> + .serdes_tbl_num = ARRAY_SIZE(sdm845_ufsphy_serdes_tbl),
>> + .tx_tbl = sdm845_ufsphy_tx_tbl,
>> + .tx_tbl_num = ARRAY_SIZE(sdm845_ufsphy_tx_tbl),
>> + .rx_tbl = sdm845_ufsphy_rx_tbl,
>> + .rx_tbl_num = ARRAY_SIZE(sdm845_ufsphy_rx_tbl),
>> + .pcs_tbl = sdm845_ufsphy_pcs_tbl,
>> + .pcs_tbl_num = ARRAY_SIZE(sdm845_ufsphy_pcs_tbl),
>> + .clk_list = sdm845_ufs_phy_clk_l,
>> + .num_clks = ARRAY_SIZE(sdm845_ufs_phy_clk_l),
>> + .vreg_list = sdm845_phy_vreg_l,
>> + .num_vregs = ARRAY_SIZE(sdm845_phy_vreg_l),
>> + .regs = sdm845_ufsphy_regs_layout,
>> +
>> + .start_ctrl = SERDES_START,
>> + .pwrdn_ctrl = SW_PWRDN,
>> + .mask_pcs_ready = PCS_READY,
>> };
>>
>> static void qcom_qmp_phy_configure(void __iomem *base,
>> @@ -998,7 +1109,8 @@ static int qcom_qmp_phy_init(struct phy *phy)
>> usleep_range(cfg->pwrdn_delay_min, cfg->pwrdn_delay_max);
>>
>> /* Pull PHY out of reset state */
>> - qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
>> + if (cfg->has_sw_rst)
>> + qphy_clrbits(pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
>> if (cfg->has_phy_dp_com_ctrl)
>> qphy_clrbits(dp_com, QPHY_V3_DP_COM_SW_RESET, SW_RESET);
>>
>> @@ -1036,7 +1148,8 @@ static int qcom_qmp_phy_exit(struct phy *phy)
>> clk_disable_unprepare(qphy->pipe_clk);
>>
>> /* PHY reset */
>> - qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
>> + if (cfg->has_sw_rst)
>> + qphy_setbits(qphy->pcs, cfg->regs[QPHY_SW_RESET], SW_RESET);
>>
>> /* stop SerDes and Phy-Coding-Sublayer */
>> qphy_clrbits(qphy->pcs, cfg->regs[QPHY_START_CTRL], cfg->start_ctrl);
>> @@ -1383,6 +1496,9 @@ int qcom_qmp_phy_create(struct device *dev,
>> struct device_node *np, int id)
>> }, {
>> .compatible = "qcom,qmp-v3-usb3-phy",
>> .data = &qmp_v3_usb3phy_cfg,
>> + }, {
>> + .compatible = "qcom,sdm845-qmp-ufs-phy",
>> + .data = &sdm845_ufsphy_cfg,
>> },
>> { },
>> };
>> diff --git a/drivers/phy/qualcomm/phy-qcom-qmp.h
>> b/drivers/phy/qualcomm/phy-qcom-qmp.h
>> index d1c6905..ea4b4dc 100644
>> --- a/drivers/phy/qualcomm/phy-qcom-qmp.h
>> +++ b/drivers/phy/qualcomm/phy-qcom-qmp.h
>> @@ -184,6 +184,8 @@
>> #define QSERDES_V3_COM_VCO_TUNE2_MODE0 0x0f8
>> #define QSERDES_V3_COM_VCO_TUNE1_MODE1 0x0fc
>> #define QSERDES_V3_COM_VCO_TUNE2_MODE1 0x100
>> +#define QSERDES_V3_COM_VCO_TUNE_INITVAL1 0x104
>> +#define QSERDES_V3_COM_VCO_TUNE_INITVAL2 0x108
>> #define QSERDES_V3_COM_VCO_TUNE_TIMER1 0x11c
>> #define QSERDES_V3_COM_VCO_TUNE_TIMER2 0x120
>> #define QSERDES_V3_COM_CLK_SELECT 0x138
>> @@ -211,8 +213,13 @@
>> /* Only for QMP V3 PHY - RX registers */
>> #define QSERDES_V3_RX_UCDR_SO_GAIN_HALF 0x00c
>> #define QSERDES_V3_RX_UCDR_SO_GAIN 0x014
>> +#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_HALF 0x024
>> +#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN_QUARTER 0x028
>> +#define QSERDES_V3_RX_UCDR_SVS_SO_GAIN 0x02c
>> #define QSERDES_V3_RX_UCDR_FASTLOCK_FO_GAIN 0x030
>> #define QSERDES_V3_RX_UCDR_SO_SATURATION_AND_ENABLE 0x034
>> +#define QSERDES_V3_RX_UCDR_FASTLOCK_COUNT_LOW 0x03c
>> +#define QSERDES_V3_RX_UCDR_PI_CONTROLS 0x044
>> #define QSERDES_V3_RX_RX_TERM_BW 0x07c
>> #define QSERDES_V3_RX_RX_EQ_GAIN2_LSB 0x0c8
>> #define QSERDES_V3_RX_RX_EQ_GAIN2_MSB 0x0cc
>> @@ -272,6 +279,7 @@
>> #define QPHY_V3_PCS_FLL_CNT_VAL_L 0x0cc
>> #define QPHY_V3_PCS_FLL_CNT_VAL_H_TOL 0x0d0
>> #define QPHY_V3_PCS_FLL_MAN_CODE 0x0d4
>> +#define QPHY_V3_PCS_MULTI_LANE_CTRL1 0x1c4
>> #define QPHY_V3_PCS_RX_SIGDET_LVL 0x1d8
>>
>> /* Only for QMP V3 PHY - PCS_MISC registers */
--
The Qualcomm Innovation Center, Inc. is a member of the Code Aurora Forum,
a Linux Foundation Collaborative Project
^ permalink raw reply [flat|nested] 7+ messages in thread
end of thread, other threads:[~2018-03-21 3:34 UTC | newest]
Thread overview: 7+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2018-03-20 11:30 [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845 Can Guo
2018-03-20 11:30 ` [PATCH v1 1/2] phy: Add QMP phy based UFS phy support for sdm845 Can Guo
2018-03-21 2:42 ` cang
2018-03-21 3:34 ` Manu Gautam
2018-03-20 11:30 ` [PATCH v1 2/2] dt-bindings: phy-qcom-qmp: Update UFS phy binding " Can Guo
2018-03-21 2:39 ` cang
2018-03-21 2:42 ` [PATCH v1 0/2] Support for Qualcomm UFS QMP PHY on SDM845 cang
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).