Skip to content
Open
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Original file line number Diff line number Diff line change
Expand Up @@ -20,6 +20,7 @@ properties:
- qcom,qcm2290-qmp-usb3-phy
- qcom,qcs615-qmp-usb3-phy
- qcom,sdm660-qmp-usb3-phy
- qcom,shikra-qmp-usb3-phy
- qcom,sm6115-qmp-usb3-phy

reg:
Expand Down Expand Up @@ -116,6 +117,7 @@ allOf:
contains:
enum:
- qcom,qcm2290-qmp-usb3-phy
- qcom,shikra-qmp-usb3-phy
- qcom,sm6115-qmp-usb3-phy
then:
properties:
Expand Down
1 change: 1 addition & 0 deletions Documentation/devicetree/bindings/phy/qcom,qusb2-phy.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ properties:
- qcom,qcm2290-qusb2-phy
- qcom,qcs615-qusb2-phy
- qcom,sdm660-qusb2-phy
- qcom,shikra-qusb2-phy
- qcom,sm4250-qusb2-phy
- qcom,sm6115-qusb2-phy
- items:
Expand Down
3 changes: 3 additions & 0 deletions Documentation/devicetree/bindings/usb/qcom,snps-dwc3.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -59,6 +59,7 @@ properties:
- qcom,sdx55-dwc3
- qcom,sdx65-dwc3
- qcom,sdx75-dwc3
- qcom,shikra-dwc3
- qcom,sm4250-dwc3
- qcom,sm6115-dwc3
- qcom,sm6125-dwc3
Expand Down Expand Up @@ -352,6 +353,7 @@ allOf:
- qcom,sar2130p-dwc3
- qcom,sc8180x-dwc3
- qcom,sc8180x-dwc3-mp
- qcom,shikra-dwc3
- qcom,sm6115-dwc3
- qcom,sm6125-dwc3
- qcom,sm8150-dwc3
Expand Down Expand Up @@ -424,6 +426,7 @@ allOf:
- qcom,ipq8074-dwc3
- qcom,msm8953-dwc3
- qcom,msm8998-dwc3
- qcom,shikra-dwc3
then:
properties:
interrupts:
Expand Down
3 changes: 3 additions & 0 deletions drivers/phy/qualcomm/phy-qcom-qmp-usbc.c
Original file line number Diff line number Diff line change
Expand Up @@ -2019,6 +2019,9 @@ static const struct of_device_id qmp_usbc_of_match_table[] = {
}, {
.compatible = "qcom,sdm660-qmp-usb3-phy",
.data = &sdm660_usb3phy_cfg,
}, {
.compatible = "qcom,shikra-qmp-usb3-phy",
.data = &qcs615_usb3phy_cfg,
}, {
.compatible = "qcom,sm6115-qmp-usb3-phy",
.data = &qcm2290_usb3phy_cfg,
Expand Down
16 changes: 16 additions & 0 deletions drivers/phy/qualcomm/phy-qcom-qusb2.c
Original file line number Diff line number Diff line change
Expand Up @@ -381,6 +381,19 @@ static const struct qusb2_phy_cfg sdm660_phy_cfg = {
.autoresume_en = BIT(3),
};

static const struct qusb2_phy_cfg shikra_phy_cfg = {
.tbl = qcs615_init_tbl,
.tbl_num = ARRAY_SIZE(qcs615_init_tbl),
.regs = ipq6018_regs_layout,

.has_pll_test = true,
.se_clk_scheme_default = true,
.disable_ctrl = (CLAMP_N_EN | FREEZIO_N | POWER_DOWN),
.mask_core_ready = PLL_LOCKED,
.autoresume_en = BIT(3),
.update_tune1_with_efuse = false,
};

static const struct qusb2_phy_cfg sm6115_phy_cfg = {
.tbl = sm6115_init_tbl,
.tbl_num = ARRAY_SIZE(sm6115_init_tbl),
Expand Down Expand Up @@ -958,6 +971,9 @@ static const struct of_device_id qusb2_phy_of_match_table[] = {
}, {
.compatible = "qcom,sdm660-qusb2-phy",
.data = &sdm660_phy_cfg,
}, {
.compatible = "qcom,shikra-qusb2-phy",
.data = &shikra_phy_cfg,
}, {
.compatible = "qcom,sm4250-qusb2-phy",
.data = &sm6115_phy_cfg,
Expand Down