| Message ID | 20240113-pmi632-typec-v1-13-de7dfd459353@linaro.org |
|---|---|
| State | Superseded |
| Headers | show |
| Series | usb: typec: qcom-pmic-typec: enable support for PMI632 PMIC | expand |
On 13.01.2024 06:42, Dmitry Baryshkov wrote: > Plug in USB-C related bits and pieces to enable USB role switching and > USB-C orientation handling for the Qualcomm RB2 board. > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > --- > arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 62 ++++++++++++++++++++++++++++++++ > arch/arm64/boot/dts/qcom/sm6115.dtsi | 38 ++++++++++++++++++++ > 2 files changed, 100 insertions(+) > > diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > index 52f31f3166c2..a96e3afb65bc 100644 > --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > @@ -6,8 +6,10 @@ > /dts-v1/; > > #include <dt-bindings/leds/common.h> > +#include <dt-bindings/usb/pd.h> > #include "sm4250.dtsi" > #include "pm6125.dtsi" > +#include "pmi632.dtsi" > > / { > model = "Qualcomm Technologies, Inc. QRB4210 RB2"; > @@ -256,6 +258,53 @@ kypd_vol_up_n: kypd-vol-up-n-state { > }; > }; > > +&pmi632_typec { > + status = "okay"; > + > + connector { > + compatible = "usb-c-connector"; > + > + power-role = "dual"; > + data-role = "dual"; > + self-powered; > + > + source-pdos = <PDO_FIXED(5000, 3000, > + PDO_FIXED_DUAL_ROLE | > + PDO_FIXED_USB_COMM | > + PDO_FIXED_DATA_SWAP)>; > + sink-pdos = <PDO_FIXED(5000, 500, > + PDO_FIXED_DUAL_ROLE | > + PDO_FIXED_USB_COMM | > + PDO_FIXED_DATA_SWAP)>; > + op-sink-microwatt = <10000000>; So RB2 can provide 15 watts over the USB-C port, consume 2.5 but requires 10? That doesn't make a whole lot of sense.. Unless I'm reading this wrong.. > +&usb_dwc3 { > + usb-role-switch; Since this is a dual-role controller, I think this could live in the SoC DT > +}; > + > +&usb_dwc3_hs { > + remote-endpoint = <&pmi632_hs_in>; > +}; > + > &usb_hsphy { > vdd-supply = <&vreg_l4a_0p9>; > vdda-pll-supply = <&vreg_l12a_1p8>; > @@ -618,10 +675,15 @@ &usb_hsphy { > &usb_qmpphy { > vdda-phy-supply = <&vreg_l4a_0p9>; > vdda-pll-supply = <&vreg_l12a_1p8>; > + orientation-switch; Similarly, if this doesn't kaboom w/ our implementation too much, the PHY itself has orientation detection capabilities Konrad
On Sat, 13 Jan 2024 at 12:52, Konrad Dybcio <konrad.dybcio@linaro.org> wrote: > > On 13.01.2024 06:42, Dmitry Baryshkov wrote: > > Plug in USB-C related bits and pieces to enable USB role switching and > > USB-C orientation handling for the Qualcomm RB2 board. > > > > Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> > > --- > > arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 62 ++++++++++++++++++++++++++++++++ > > arch/arm64/boot/dts/qcom/sm6115.dtsi | 38 ++++++++++++++++++++ > > 2 files changed, 100 insertions(+) > > > > diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > > index 52f31f3166c2..a96e3afb65bc 100644 > > --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > > +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts > > @@ -6,8 +6,10 @@ > > /dts-v1/; > > > > #include <dt-bindings/leds/common.h> > > +#include <dt-bindings/usb/pd.h> > > #include "sm4250.dtsi" > > #include "pm6125.dtsi" > > +#include "pmi632.dtsi" > > > > / { > > model = "Qualcomm Technologies, Inc. QRB4210 RB2"; > > @@ -256,6 +258,53 @@ kypd_vol_up_n: kypd-vol-up-n-state { > > }; > > }; > > > > +&pmi632_typec { > > + status = "okay"; > > + > > + connector { > > + compatible = "usb-c-connector"; > > + > > + power-role = "dual"; > > + data-role = "dual"; > > + self-powered; > > + > > + source-pdos = <PDO_FIXED(5000, 3000, > > + PDO_FIXED_DUAL_ROLE | > > + PDO_FIXED_USB_COMM | > > + PDO_FIXED_DATA_SWAP)>; > > + sink-pdos = <PDO_FIXED(5000, 500, > > + PDO_FIXED_DUAL_ROLE | > > + PDO_FIXED_USB_COMM | > > + PDO_FIXED_DATA_SWAP)>; > > + op-sink-microwatt = <10000000>; > So RB2 can provide 15 watts over the USB-C port, consume 2.5 but > requires 10? That doesn't make a whole lot of sense.. > > Unless I'm reading this wrong.. Let me double-check the properties and the docs before answering. > > > +&usb_dwc3 { > > + usb-role-switch; > > Since this is a dual-role controller, I think this could live in the SoC Sure. Should we update other boards too? > DT > > > +}; > > + > > +&usb_dwc3_hs { > > + remote-endpoint = <&pmi632_hs_in>; > > +}; > > + > > &usb_hsphy { > > vdd-supply = <&vreg_l4a_0p9>; > > vdda-pll-supply = <&vreg_l12a_1p8>; > > @@ -618,10 +675,15 @@ &usb_hsphy { > > &usb_qmpphy { > > vdda-phy-supply = <&vreg_l4a_0p9>; > > vdda-pll-supply = <&vreg_l12a_1p8>; > > + orientation-switch; > > Similarly, if this doesn't kaboom w/ our implementation too much, the > PHY itself has orientation detection capabilities > > Konrad
diff --git a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts index 52f31f3166c2..a96e3afb65bc 100644 --- a/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts +++ b/arch/arm64/boot/dts/qcom/qrb4210-rb2.dts @@ -6,8 +6,10 @@ /dts-v1/; #include <dt-bindings/leds/common.h> +#include <dt-bindings/usb/pd.h> #include "sm4250.dtsi" #include "pm6125.dtsi" +#include "pmi632.dtsi" / { model = "Qualcomm Technologies, Inc. QRB4210 RB2"; @@ -256,6 +258,53 @@ kypd_vol_up_n: kypd-vol-up-n-state { }; }; +&pmi632_typec { + status = "okay"; + + connector { + compatible = "usb-c-connector"; + + power-role = "dual"; + data-role = "dual"; + self-powered; + + source-pdos = <PDO_FIXED(5000, 3000, + PDO_FIXED_DUAL_ROLE | + PDO_FIXED_USB_COMM | + PDO_FIXED_DATA_SWAP)>; + sink-pdos = <PDO_FIXED(5000, 500, + PDO_FIXED_DUAL_ROLE | + PDO_FIXED_USB_COMM | + PDO_FIXED_DATA_SWAP)>; + op-sink-microwatt = <10000000>; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + pmi632_hs_in: endpoint { + remote-endpoint = <&usb_dwc3_hs>; + }; + }; + + port@1 { + reg = <1>; + pmi632_ss_in: endpoint { + remote-endpoint = <&usb_qmpphy_out>; + }; + }; + }; + }; +}; + +&pmi632_vbus { + regulator-min-microamp = <500000>; + regulator-max-microamp = <3000000>; + status = "okay"; +}; + &pon_pwrkey { status = "okay"; }; @@ -607,6 +656,14 @@ &usb { status = "okay"; }; +&usb_dwc3 { + usb-role-switch; +}; + +&usb_dwc3_hs { + remote-endpoint = <&pmi632_hs_in>; +}; + &usb_hsphy { vdd-supply = <&vreg_l4a_0p9>; vdda-pll-supply = <&vreg_l12a_1p8>; @@ -618,10 +675,15 @@ &usb_hsphy { &usb_qmpphy { vdda-phy-supply = <&vreg_l4a_0p9>; vdda-pll-supply = <&vreg_l12a_1p8>; + orientation-switch; status = "okay"; }; +&usb_qmpphy_out { + remote-endpoint = <&pmi632_ss_in>; +}; + &wifi { vdd-0.8-cx-mx-supply = <&vreg_l8a_0p664>; vdd-1.8-xo-supply = <&vreg_l16a_1p3>; diff --git a/arch/arm64/boot/dts/qcom/sm6115.dtsi b/arch/arm64/boot/dts/qcom/sm6115.dtsi index 76c429e8ebab..252074219bed 100644 --- a/arch/arm64/boot/dts/qcom/sm6115.dtsi +++ b/arch/arm64/boot/dts/qcom/sm6115.dtsi @@ -880,6 +880,25 @@ usb_qmpphy: phy@1615000 { #phy-cells = <0>; status = "disabled"; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + usb_qmpphy_out: endpoint { + }; + }; + + port@1 { + reg = <1>; + + usb_qmpphy_usb_ss_in: endpoint { + }; + }; + }; }; system_noc: interconnect@1880000 { @@ -1614,6 +1633,25 @@ usb_dwc3: usb@4e00000 { snps,has-lpm-erratum; snps,hird-threshold = /bits/ 8 <0x10>; snps,usb3_lpm_capable; + + ports { + #address-cells = <1>; + #size-cells = <0>; + + port@0 { + reg = <0>; + + usb_dwc3_hs: endpoint { + }; + }; + + port@1 { + reg = <1>; + + usb_dwc3_ss: endpoint { + }; + }; + }; }; };
Plug in USB-C related bits and pieces to enable USB role switching and USB-C orientation handling for the Qualcomm RB2 board. Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org> --- arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 62 ++++++++++++++++++++++++++++++++ arch/arm64/boot/dts/qcom/sm6115.dtsi | 38 ++++++++++++++++++++ 2 files changed, 100 insertions(+)