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 @@ -91,6 +91,11 @@ properties:

vdda-qref-supply: true

vdda-refgen-supply: true

# Only required on platforms where the hardware voting doesn't work properly
refgen-supply: true

qcom,4ln-config-sel:
description: PCIe 4-lane configuration
$ref: /schemas/types.yaml#/definitions/phandle-array
Expand Down Expand Up @@ -261,6 +266,28 @@ allOf:
"#clock-cells":
const: 0

- if:
properties:
compatible:
contains:
enum:
- qcom,qcs8300-qmp-gen4x2-pcie-phy
- qcom,sa8775p-qmp-gen4x2-pcie-phy
- qcom,sa8775p-qmp-gen4x4-pcie-phy
then:
required:
- vdda-refgen-supply

- if:
properties:
compatible:
contains:
enum:
- qcom,qcs8300-qmp-gen4x2-pcie-phy
then:
required:
- refgen-supply

examples:
- |
#include <dt-bindings/clock/qcom,gcc-sc8280xp.h>
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/lemans-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -723,6 +723,8 @@
&pcie0_phy {
vdda-phy-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l1c>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand All @@ -742,6 +744,8 @@
&pcie1_phy {
vdda-phy-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l1c>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -987,13 +987,17 @@
&pcie0_phy {
vdda-phy-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l1c>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};

&pcie1_phy {
vdda-phy-supply = <&vreg_l5a>;
vdda-pll-supply = <&vreg_l1c>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/monaco-evk.dts
Original file line number Diff line number Diff line change
Expand Up @@ -623,6 +623,8 @@
&pcie0_phy {
vdda-phy-supply = <&vreg_l6a>;
vdda-pll-supply = <&vreg_l5a>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand All @@ -637,6 +639,8 @@
&pcie1_phy {
vdda-phy-supply = <&vreg_l6a>;
vdda-pll-supply = <&vreg_l5a>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/monaco-monza-som.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -211,6 +211,8 @@
&pcie0_phy {
vdda-phy-supply = <&vreg_l6a>;
vdda-pll-supply = <&vreg_l5a>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand All @@ -223,6 +225,8 @@
&pcie1_phy {
vdda-phy-supply = <&vreg_l6a>;
vdda-pll-supply = <&vreg_l5a>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/monaco.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -2452,6 +2452,8 @@

#phy-cells = <0>;

refgen-supply = <&refgen>;

status = "disabled";
};

Expand Down Expand Up @@ -2643,6 +2645,8 @@

#phy-cells = <0>;

refgen-supply = <&refgen>;

status = "disabled";
};

Expand Down
4 changes: 4 additions & 0 deletions arch/arm64/boot/dts/qcom/qcs8300-ride.dts
Original file line number Diff line number Diff line change
Expand Up @@ -638,6 +638,8 @@
&pcie0_phy {
vdda-phy-supply = <&vreg_l6a>;
vdda-pll-supply = <&vreg_l5a>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand All @@ -657,6 +659,8 @@
&pcie1_phy {
vdda-phy-supply = <&vreg_l6a>;
vdda-pll-supply = <&vreg_l5a>;
vdda-qref-supply = <&vreg_l4a>;
vdda-refgen-supply = <&vreg_l7a>;

status = "okay";
};
Expand Down
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/qcom/qcs9100-ride-r3.dts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@
model = "Qualcomm Technologies, Inc. Lemans Ride Rev3";
compatible = "qcom,qcs9100-ride-r3", "qcom,qcs9100", "qcom,sa8775p";
};

&pcie0_phy {
vdda-refgen-supply = <&vreg_l7a>;
};

&pcie1_phy {
vdda-refgen-supply = <&vreg_l7a>;
};
8 changes: 8 additions & 0 deletions arch/arm64/boot/dts/qcom/qcs9100-ride.dts
Original file line number Diff line number Diff line change
Expand Up @@ -14,3 +14,11 @@
model = "Qualcomm Technologies, Inc. Lemans Ride";
compatible = "qcom,qcs9100-ride", "qcom,qcs9100", "qcom,sa8775p";
};

&pcie0_phy {
vdda-refgen-supply = <&vreg_l7a>;
};

&pcie1_phy {
vdda-refgen-supply = <&vreg_l7a>;
};
16 changes: 10 additions & 6 deletions drivers/phy/qualcomm/phy-qcom-qmp-pcie.c
Original file line number Diff line number Diff line change
Expand Up @@ -3488,6 +3488,10 @@ static const char * const sm8550_qmp_phy_vreg_l[] = {
"vdda-phy", "vdda-pll", "vdda-qref",
};

static const char * const sa8775p_qmp_phy_vreg_l[] = {
"vdda-phy", "vdda-pll", "vdda-qref", "vdda-refgen", "refgen",
};

/* list of resets */
static const char * const ipq8074_pciephy_reset_l[] = {
"phy", "common",
Expand Down Expand Up @@ -4394,8 +4398,8 @@ static const struct qmp_phy_cfg sm8450_qmp_gen4x2_pciephy_cfg = {

.reset_list = sdm845_pciephy_reset_l,
.num_resets = ARRAY_SIZE(sdm845_pciephy_reset_l),
.vreg_list = qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
.vreg_list = sa8775p_qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(sa8775p_qmp_phy_vreg_l),
.regs = pciephy_v5_regs_layout,

.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
Expand Down Expand Up @@ -4563,8 +4567,8 @@ static const struct qmp_phy_cfg sa8775p_qmp_gen4x2_pciephy_cfg = {

.reset_list = sdm845_pciephy_reset_l,
.num_resets = ARRAY_SIZE(sdm845_pciephy_reset_l),
.vreg_list = qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
.vreg_list = sa8775p_qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(sa8775p_qmp_phy_vreg_l),
.regs = pciephy_v5_regs_layout,

.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
Expand Down Expand Up @@ -4604,8 +4608,8 @@ static const struct qmp_phy_cfg sa8775p_qmp_gen4x4_pciephy_cfg = {

.reset_list = sdm845_pciephy_reset_l,
.num_resets = ARRAY_SIZE(sdm845_pciephy_reset_l),
.vreg_list = qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(qmp_phy_vreg_l),
.vreg_list = sa8775p_qmp_phy_vreg_l,
.num_vregs = ARRAY_SIZE(sa8775p_qmp_phy_vreg_l),
.regs = pciephy_v5_regs_layout,

.pwrdn_ctrl = SW_PWRDN | REFCLK_DRV_DSBL,
Expand Down
Loading