Enable USB support in IPQ8074
Subsystems (4)
v2 cover Enable USB support in IPQ8074
IPQ8074 has two super speed USB ports, with QMP and QUSB2 PHYs. This patch set enables the USB PHYs and USB dwc3 in IPQ8074.
This patch set depends on Sandeep's QMP PHY binding patch
https://patchwork.ozlabs.org/patch/1265442/
and Sivaprakash's IPQ8074 dts re-arrange patch
https://lkml.org/lkml/2020/4/10/706
[V2]
* Added new device compatible qcom,ipq8074-qusb2-phy for qusb2
* Addressed Bjorn's review comments on dts and binding
Sivaprakash Murugesan (5):
dt-bindings: phy: qcom,qmp: Add ipq8074 usb dt bindings
dt-bindings: phy: qcom,qusb2: Add ipq8074 device compatible
phy: qcom-qmp: Add USB QMP PHY support for IPQ8074
phy: qcom-qusb2: Add ipq8074 device compatible
arm64: dts: ipq8074: enable USB support
.../devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 24 +++ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 167 +++++++++++++++++++++ drivers/phy/qualcomm/phy-qcom-qmp.c | 102 +++++++++++++ drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 + 6 files changed, 299 insertions(+)
Signature · 1 line
2.7.4
PATCH v2 1/5 dt-bindings: phy: qcom,qmp: Add ipq8074 usb dt bindings
Add ipq8074 qmp phy device compatible for super speed usb support.
---
[V2]
* corrected typo in compatible
Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 ++ 1 file changed, 2 insertions(+)
Documentation/devicetree/bindings/phy/qcom,qmp-phy.yaml +2 -0
@@ -18,6 +18,7 @@ properties: compatible: enum: - qcom,ipq8074-qmp-pcie-phy + - qcom,ipq8074-qmp-usb3-phy - qcom,msm8996-qmp-pcie-phy - qcom,msm8996-qmp-ufs-phy - qcom,msm8996-qmp-usb3-phy
@@ -166,6 +167,7 @@ allOf: compatible: contains: enum: + - qcom,ipq8074-qmp-usb3-phy - qcom,msm8996-qmp-usb3-phy - qcom,msm8998-qmp-pcie-phy - qcom,msm8998-qmp-usb3-phy
Signature · 1 line
2.7.4
Re: [PATCH V2 1/5] dt-bindings: phy: qcom,qmp: Add ipq8074 usb dt bindings
Quoted 9 lines · Sivaprakash Murugesan
Add ipq8074 qmp phy device compatible for super speed usb support.
Signed-off-by Sivaprakash Murugesan <[email protected]>---
[V2]
* corrected typo in compatibleDocumentation/devicetree/bindings/phy/qcom,qmp-phy.yaml | 2 ++ 1 file changed, 2 insertions(+)
PATCH v2 2/5 dt-bindings: phy: qcom,qusb2: Add ipq8074 device compatible
In reply to Sivaprakash MurugesanAdd ipq8074 compatible in QUSB2 PHY for high speed USB support.
---
[V2]
* Added new compatible for IPQ8074
Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + 1 file changed, 1 insertion(+)
Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml +1 -0
@@ -18,6 +18,7 @@ properties: oneOf: - items: - enum: + - qcom,ipq8074-qusb2-phy - qcom,msm8996-qusb2-phy - qcom,msm8998-qusb2-phy - items:
Signature · 1 line
2.7.4
Re: [PATCH V2 2/5] dt-bindings: phy: qcom,qusb2: Add ipq8074 device compatible
Quoted 9 lines · Sivaprakash Murugesan
Add ipq8074 compatible in QUSB2 PHY for high speed USB support.
Signed-off-by Sivaprakash Murugesan <[email protected]>---
[V2]
* Added new compatible for IPQ8074Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml | 1 + 1 file changed, 1 insertion(+)
PATCH v2 3/5 phy: qcom-qmp: Add USB QMP PHY support for IPQ8074
In reply to Sivaprakash MurugesanAdd QMP USB PHY found in IPQ8074
--- drivers/phy/qualcomm/phy-qcom-qmp.c | 102 ++++++++++++++++++++++++++++++++++++ 1 file changed, 102 insertions(+)
drivers/phy/qualcomm/phy-qcom-qmp.c +102 -0
@@ -188,6 +188,81 @@ static const unsigned int sm8150_ufsphy_regs_layout[] = { [QPHY_SW_RESET] = QPHY_V4_SW_RESET, }; +static const struct qmp_phy_init_tbl ipq8074_usb3_serdes_tbl[] = { +QMP_PHY_INIT_CFG (QSERDES_COM_SYSCLK_EN_SEL ,0x1a ), +QMP_PHY_INIT_CFG (QSERDES_COM_BIAS_EN_CLKBUFLR_EN ,0x08 ), +QMP_PHY_INIT_CFG (QSERDES_COM_CLK_SELECT ,0x30 ), +QMP_PHY_INIT_CFG (QSERDES_COM_BG_TRIM ,0x0f ), +QMP_PHY_INIT_CFG (QSERDES_RX_UCDR_FASTLOCK_FO_GAIN ,0x0b ), +QMP_PHY_INIT_CFG (QSERDES_COM_SVS_MODE_CLK_SEL ,0x01 ), +QMP_PHY_INIT_CFG (QSERDES_COM_HSCLK_SEL ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_COM_CMN_CONFIG ,0x06 ), +QMP_PHY_INIT_CFG (QSERDES_COM_PLL_IVCO ,0x0f ), +QMP_PHY_INIT_CFG (QSERDES_COM_SYS_CLK_CTRL ,0x06 ), +/* PLL and Loop filter settings */ +QMP_PHY_INIT_CFG (QSERDES_COM_DEC_START_MODE0 ,0x82 ), +QMP_PHY_INIT_CFG (QSERDES_COM_DIV_FRAC_START1_MODE0 ,0x55 ), +QMP_PHY_INIT_CFG (QSERDES_COM_DIV_FRAC_START2_MODE0 ,0x55 ), +QMP_PHY_INIT_CFG (QSERDES_COM_DIV_FRAC_START3_MODE0 ,0x03 ), +QMP_PHY_INIT_CFG (QSERDES_COM_CP_CTRL_MODE0 ,0x0b ), +QMP_PHY_INIT_CFG (QSERDES_COM_PLL_RCTRL_MODE0 ,0x16 ), +QMP_PHY_INIT_CFG (QSERDES_COM_PLL_CCTRL_MODE0 ,0x28 ), +QMP_PHY_INIT_CFG (QSERDES_COM_INTEGLOOP_GAIN0_MODE0 ,0x80 ), +QMP_PHY_INIT_CFG (QSERDES_COM_LOCK_CMP1_MODE0 ,0x15 ), +QMP_PHY_INIT_CFG (QSERDES_COM_LOCK_CMP2_MODE0 ,0x34 ), +QMP_PHY_INIT_CFG (QSERDES_COM_LOCK_CMP3_MODE0 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_COM_CORE_CLK_EN ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_COM_LOCK_CMP_CFG ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_COM_VCO_TUNE_MAP ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_COM_BG_TIMER ,0x0a ), +/* SSC settings */ +QMP_PHY_INIT_CFG (QSERDES_COM_SSC_EN_CENTER ,0x01 ), +QMP_PHY_INIT_CFG (QSERDES_COM_SSC_PER1 ,0x31 ), +QMP_PHY_INIT_CFG (QSERDES_COM_SSC_PER2 ,0x01 ), +QMP_PHY_INIT_CFG (QSERDES_COM_SSC_ADJ_PER1 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_COM_SSC_ADJ_PER2 ,0x00 ), +QMP_PHY_INIT_CFG (QSERDES_COM_SSC_STEP_SIZE1 ,0xde ), +QMP_PHY_INIT_CFG (QSERDES_COM_SSC_STEP_SIZE2 ,0x07 ), +}; + +static const struct qmp_phy_init_tbl ipq8074_usb3_rx_tbl[] = { +QMP_PHY_INIT_CFG (QSERDES_RX_UCDR_SO_GAIN ,0x06 ), +QMP_PHY_INIT_CFG (QSERDES_RX_RX_EQU_ADAPTOR_CNTRL2 ,0x02 ), +QMP_PHY_INIT_CFG (QSERDES_RX_RX_EQU_ADAPTOR_CNTRL3 ,0x4c ), +QMP_PHY_INIT_CFG (QSERDES_RX_RX_EQU_ADAPTOR_CNTRL4 ,0xb8 ), +QMP_PHY_INIT_CFG (QSERDES_RX_RX_EQ_OFFSET_ADAPTOR_CNTRL1 ,0x77 ), +QMP_PHY_INIT_CFG (QSERDES_RX_RX_OFFSET_ADAPTOR_CNTRL2 ,0x80 ), +QMP_PHY_INIT_CFG (QSERDES_RX_SIGDET_CNTRL ,0x03 ), +QMP_PHY_INIT_CFG (QSERDES_RX_SIGDET_DEGLITCH_CNTRL ,0x16 ), +QMP_PHY_INIT_CFG (QSERDES_RX_SIGDET_ENABLES ,0x0 ), +}; + +static const struct qmp_phy_init_tbl ipq8074_usb3_pcs_tbl[] = { +QMP_PHY_INIT_CFG (QPHY_V3_PCS_TXDEEMPH_M6DB_V0 ,0x15 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_TXDEEMPH_M3P5DB_V0 ,0x0e ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_FLL_CNTRL2 ,0x83 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_FLL_CNTRL1 ,0x02 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_FLL_CNT_VAL_L ,0x09 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_FLL_CNT_VAL_H_TOL ,0xa2 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_FLL_MAN_CODE ,0x85 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_LOCK_DETECT_CONFIG1 ,0xd1 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_LOCK_DETECT_CONFIG2 ,0x1f ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_LOCK_DETECT_CONFIG3 ,0x47 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_POWER_STATE_CONFIG2 ,0x1b ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_RXEQTRAINING_WAIT_TIME ,0x75 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_RXEQTRAINING_RUN_TIME ,0x13 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_LFPS_TX_ECSTART_EQTLOCK ,0x86 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_PWRUP_RESET_DLY_TIME_AUXCLK ,0x04 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_TSYNC_RSYNC_TIME ,0x44 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_RCVR_DTCT_DLY_P1U2_L ,0xe7 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_RCVR_DTCT_DLY_P1U2_H ,0x03 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_RCVR_DTCT_DLY_U3_L ,0x40 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_RCVR_DTCT_DLY_U3_H ,0x00 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_RX_SIGDET_LVL ,0x88 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_TXDEEMPH_M6DB_V0 ,0x17 ), +QMP_PHY_INIT_CFG (QPHY_V3_PCS_TXDEEMPH_M3P5DB_V0 ,0x0f ), +}; +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 ),
@@ -1467,6 +1542,30 @@ static const char * const qmp_phy_vreg_l[] = { "vdda-phy", "vdda-pll", }; +static const struct qmp_phy_cfg ipq8074_usb3phy_cfg = { + .type =PHY_TYPE_USB3 , + .nlanes =1 , + + .serdes_tbl = ipq8074_usb3_serdes_tbl, + .serdes_tbl_num =ARRAY_SIZE (ipq8074_usb3_serdes_tbl), + .tx_tbl = msm8996_usb3_tx_tbl, + .tx_tbl_num =ARRAY_SIZE (msm8996_usb3_tx_tbl), + .rx_tbl = ipq8074_usb3_rx_tbl, + .rx_tbl_num =ARRAY_SIZE (ipq8074_usb3_rx_tbl), + .pcs_tbl = ipq8074_usb3_pcs_tbl, + .pcs_tbl_num =ARRAY_SIZE (ipq8074_usb3_pcs_tbl), + .clk_list = msm8996_phy_clk_l, + .num_clks =ARRAY_SIZE (msm8996_phy_clk_l), + .reset_list = msm8996_usb3phy_reset_l, + .num_resets =ARRAY_SIZE (msm8996_usb3phy_reset_l), + .vreg_list = qmp_phy_vreg_l, + .num_vregs =ARRAY_SIZE (qmp_phy_vreg_l), + .regs = usb3phy_regs_layout, + + .start_ctrl =SERDES_START |PCS_START , + .pwrdn_ctrl =SW_PWRDN , +}; +static const struct qmp_phy_cfg msm8996_pciephy_cfg = { .type =PHY_TYPE_PCIE , .nlanes =3 ,
@@ -2498,6 +2597,9 @@ int qcom_qmp_phy_create(struct device *dev, struct device_node *np, int id)static const struct of_device_id qcom_qmp_phy_of_match_table[] = { { + .compatible ="qcom,ipq8074-qmp-usb3-phy" , + .data = &ipq8074_usb3phy_cfg, + }, { .compatible ="qcom,msm8996-qmp-pcie-phy" , .data = &msm8996_pciephy_cfg, }, {
Signature · 1 line
2.7.4
PATCH v2 4/5 phy: qcom-qusb2: Add ipq8074 device compatible
In reply to Sivaprakash MurugesanAdd ipq8074 qusb2 device compatible for high speed usb support.
---
[V2]
* Added new compatible for IPQ8074
drivers/phy/qualcomm/phy-qcom-qusb2.c | 3 +++ 1 file changed, 3 insertions(+)
drivers/phy/qualcomm/phy-qcom-qusb2.c +3 -0
@@ -810,6 +810,9 @@ static const struct phy_ops qusb2_phy_gen_ops = {static const struct of_device_id qusb2_phy_of_match_table[] = { { + .compatible ="qcom,ipq8074-qusb2-phy" , + .data = &msm8996_phy_cfg, + }, { .compatible ="qcom,msm8996-qusb2-phy" , .data = &msm8996_phy_cfg, }, {
Signature · 1 line
2.7.4
PATCH v2 5/5 arm64: dts: ipq8074: enable USB support
In reply to Sivaprakash MurugesanIPQ8074 has two super speed usb ports, add phy and dwc3 nodes to enable them.
---
[V2]
* Addressed Bjorn's review comments
arch/arm64/boot/dts/qcom/ipq8074-hk01.dts | 24 +++++ arch/arm64/boot/dts/qcom/ipq8074.dtsi | 167 ++++++++++++++++++++++++++++++ 2 files changed, 191 insertions(+)
arch/arm64/boot/dts/qcom/ipq8074-hk01.dts +24 -0
@@ -82,3 +82,27 @@ nand-bus-width = <8>; }; }; + +&qusb_phy_0 { + status = "ok"; +}; + +&qusb_phy_1 { + status = "ok"; +}; + +&ssphy_0 { + status = "ok"; +}; + +&ssphy_1 { + status = "ok"; +}; + +&usb_0 { + status = "ok"; +}; + +&usb_1 { + status = "ok"; +};
arch/arm64/boot/dts/qcom/ipq8074.dtsi +167 -0
179 lines not on this page · raw message
Signature · 1 line
2.7.4