| Message ID | 20240322-fp4-tcpm-v1-5-c5644099d57b@fairphone.com |
|---|---|
| State | New |
| Headers | show |
| Series | Add TCPM support for PM7250B and Fairphone 4 | expand |
On Fri, 22 Mar 2024 at 10:03, Luca Weiss <luca.weiss@fairphone.com> wrote: > > Configure the Type-C and VBUS regulator on PM7250B and wire it up to the > USB PHY, so that USB role and orientation switching works. > > Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> > --- > With this patch I'm not quite sure if the 'ports' are connected > correctly, though functionally everything appears to work fine. > > On some other SoCs port@1 in qmpphy and a second port in dwc3 are > connected together also - one port of USB 2.0 HS, one for USB 3.0 SS. > > Here I'm following sm8250's solution. Also checking the binding doc > doesn't reveal anything useful. Thanks for pointing it out. The SM8250 / RB5 predated final DP bindings / graphs. As such it didn't fully describe the signal chain (the signals go from DWC3 and from DP controllers to the QMP PHY, where they are muxed to the 4 output lanes). I'll post an update for sm8250 / bindings doc. I'd kindly ask to connect qmp / port@1 and dwc / port@1 > --- > arch/arm64/boot/dts/qcom/sm6350.dtsi | 25 ++++++++++ > arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 57 ++++++++++++++++++++++- > 2 files changed, 81 insertions(+), 1 deletion(-) > > diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi > index 24bcec3366ef..b267500467f0 100644 > --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi > +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi > @@ -1686,6 +1686,27 @@ usb_1_qmpphy: phy@88e8000 { > #phy-cells = <1>; > > status = "disabled"; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + > + usb_1_qmpphy_out: endpoint {}; > + }; > + > + port@1 { > + reg = <1>; > + }; > + > + port@2 { > + reg = <2>; > + > + usb_1_qmpphy_dp_in: endpoint {}; > + }; > + }; > }; > > dc_noc: interconnect@9160000 { > @@ -1861,6 +1882,10 @@ usb_1_dwc3: usb@a600000 { > snps,hird-threshold = /bits/ 8 <0x10>; > phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; > phy-names = "usb2-phy", "usb3-phy"; > + > + port { > + usb_1_role_switch_out: endpoint {}; > + }; > }; > }; > > diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts > index bc67e8c1fe4d..104f23ec322d 100644 > --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts > +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts > @@ -19,6 +19,7 @@ > #include <dt-bindings/leds/common.h> > #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> > #include <dt-bindings/regulator/qcom,rpmh-regulator.h> > +#include <dt-bindings/usb/pd.h> > #include "sm7225.dtsi" > #include "pm6150l.dtsi" > #include "pm6350.dtsi" > @@ -543,6 +544,50 @@ conn-therm@1 { > }; > }; > > +&pm7250b_typec { > + vdd-pdphy-supply = <&vreg_l3a>; > + > + status = "okay"; > + > + connector { > + compatible = "usb-c-connector"; > + > + power-role = "source"; > + data-role = "dual"; > + self-powered; > + > + source-pdos = <PDO_FIXED(5000, 1500, > + PDO_FIXED_DUAL_ROLE | > + PDO_FIXED_USB_COMM | > + PDO_FIXED_DATA_SWAP)>; > + > + ports { > + #address-cells = <1>; > + #size-cells = <0>; > + > + port@0 { > + reg = <0>; > + pm7250b_role_switch_in: endpoint { > + remote-endpoint = <&usb_1_role_switch_out>; > + }; > + }; > + > + port@1 { > + reg = <1>; > + pm7250b_typec_mux_in: endpoint { > + remote-endpoint = <&usb_1_qmpphy_out>; > + }; > + }; > + }; > + }; > +}; > + > +&pm7250b_vbus { > + regulator-min-microamp = <500000>; > + regulator-max-microamp = <1500000>; > + status = "okay"; > +}; > + > &pmk8350_rtc { > status = "okay"; > }; > @@ -726,7 +771,12 @@ &usb_1 { > > &usb_1_dwc3 { > maximum-speed = "super-speed"; > - dr_mode = "peripheral"; > + dr_mode = "otg"; > + usb-role-switch; > +}; > + > +&usb_1_role_switch_out { > + remote-endpoint = <&pm7250b_role_switch_in>; > }; > > &usb_1_hsphy { > @@ -740,10 +790,15 @@ &usb_1_hsphy { > &usb_1_qmpphy { > vdda-phy-supply = <&vreg_l22a>; > vdda-pll-supply = <&vreg_l16a>; > + orientation-switch; > > status = "okay"; > }; > > +&usb_1_qmpphy_out { > + remote-endpoint = <&pm7250b_typec_mux_in>; > +}; > + > &wifi { > vdd-0.8-cx-mx-supply = <&vreg_l4a>; > vdd-1.8-xo-supply = <&vreg_l7a>; > > -- > 2.44.0 > >
diff --git a/arch/arm64/boot/dts/qcom/sm6350.dtsi b/arch/arm64/boot/dts/qcom/sm6350.dtsi index 24bcec3366ef..b267500467f0 100644 --- a/arch/arm64/boot/dts/qcom/sm6350.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6350.dtsi @@ -1686,6 +1686,27 @@ usb_1_qmpphy: phy@88e8000 { #phy-cells = <1>; status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + usb_1_qmpphy_out: endpoint {}; + }; + + port@1 { + reg = <1>; + }; + + port@2 { + reg = <2>; + + usb_1_qmpphy_dp_in: endpoint {}; + }; + }; }; dc_noc: interconnect@9160000 { @@ -1861,6 +1882,10 @@ usb_1_dwc3: usb@a600000 { snps,hird-threshold = /bits/ 8 <0x10>; phys = <&usb_1_hsphy>, <&usb_1_qmpphy QMP_USB43DP_USB3_PHY>; phy-names = "usb2-phy", "usb3-phy"; + + port { + usb_1_role_switch_out: endpoint {}; + }; }; }; diff --git a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts index bc67e8c1fe4d..104f23ec322d 100644 --- a/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts +++ b/arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts @@ -19,6 +19,7 @@ #include <dt-bindings/leds/common.h> #include <dt-bindings/pinctrl/qcom,pmic-gpio.h> #include <dt-bindings/regulator/qcom,rpmh-regulator.h> +#include <dt-bindings/usb/pd.h> #include "sm7225.dtsi" #include "pm6150l.dtsi" #include "pm6350.dtsi" @@ -543,6 +544,50 @@ conn-therm@1 { }; }; +&pm7250b_typec { + vdd-pdphy-supply = <&vreg_l3a>; + + status = "okay"; + + connector { + compatible = "usb-c-connector"; + + power-role = "source"; + data-role = "dual"; + self-powered; + + source-pdos = <PDO_FIXED(5000, 1500, + PDO_FIXED_DUAL_ROLE | + PDO_FIXED_USB_COMM | + PDO_FIXED_DATA_SWAP)>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + pm7250b_role_switch_in: endpoint { + remote-endpoint = <&usb_1_role_switch_out>; + }; + }; + + port@1 { + reg = <1>; + pm7250b_typec_mux_in: endpoint { + remote-endpoint = <&usb_1_qmpphy_out>; + }; + }; + }; + }; +}; + +&pm7250b_vbus { + regulator-min-microamp = <500000>; + regulator-max-microamp = <1500000>; + status = "okay"; +}; + &pmk8350_rtc { status = "okay"; }; @@ -726,7 +771,12 @@ &usb_1 { &usb_1_dwc3 { maximum-speed = "super-speed"; - dr_mode = "peripheral"; + dr_mode = "otg"; + usb-role-switch; +}; + +&usb_1_role_switch_out { + remote-endpoint = <&pm7250b_role_switch_in>; }; &usb_1_hsphy { @@ -740,10 +790,15 @@ &usb_1_hsphy { &usb_1_qmpphy { vdda-phy-supply = <&vreg_l22a>; vdda-pll-supply = <&vreg_l16a>; + orientation-switch; status = "okay"; }; +&usb_1_qmpphy_out { + remote-endpoint = <&pm7250b_typec_mux_in>; +}; + &wifi { vdd-0.8-cx-mx-supply = <&vreg_l4a>; vdd-1.8-xo-supply = <&vreg_l7a>;
Configure the Type-C and VBUS regulator on PM7250B and wire it up to the USB PHY, so that USB role and orientation switching works. Signed-off-by: Luca Weiss <luca.weiss@fairphone.com> --- With this patch I'm not quite sure if the 'ports' are connected correctly, though functionally everything appears to work fine. On some other SoCs port@1 in qmpphy and a second port in dwc3 are connected together also - one port of USB 2.0 HS, one for USB 3.0 SS. Here I'm following sm8250's solution. Also checking the binding doc doesn't reveal anything useful. --- arch/arm64/boot/dts/qcom/sm6350.dtsi | 25 ++++++++++ arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 57 ++++++++++++++++++++++- 2 files changed, 81 insertions(+), 1 deletion(-)