Message ID | 20211005152453.89330-3-amelie.delaunay@foss.st.com |
---|---|
State | Superseded |
Headers | show |
Series | phy: stm32: add phy tuning support | expand |
On Tue, 05 Oct 2021 17:24:52 +0200, Amelie Delaunay wrote: > This patch adds the description of new optional phy tuning properties > for usbphyc phy sub nodes. > > Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> > --- > Changes in v2: > - st,phy-tuning property removed > - tuning properties are now put directly in each child node > - tuning properties are no more free form text and their name reworked > --- > .../bindings/phy/phy-stm32-usbphyc.yaml | 126 ++++++++++++++++++ > 1 file changed, 126 insertions(+) > Running 'make dtbs_check' with the schema in this patch gives the following warnings. Consider if they are expected or the schema is incorrect. These may not be new warnings. Note that it is not yet a requirement to have 0 warnings for dtbs_check. This will change in the future. Full log is available here: https://patchwork.ozlabs.org/patch/1536730 usbphyc@5a006000: usb-phy@0: 'phy-supply' is a required property arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dt.yaml arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dt.yaml arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dt.yaml arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dt.yaml arch/arm/boot/dts/stm32mp157c-lxa-mc1.dt.yaml arch/arm/boot/dts/stm32mp157c-odyssey.dt.yaml usbphyc@5a006000: usb-phy@1: 'phy-supply' is a required property arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dt.yaml arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dt.yaml arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dt.yaml arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dt.yaml arch/arm/boot/dts/stm32mp157c-lxa-mc1.dt.yaml arch/arm/boot/dts/stm32mp157c-odyssey.dt.yaml
Hi Rob, On 10/6/21 12:45 AM, Rob Herring wrote: > On Tue, 05 Oct 2021 17:24:52 +0200, Amelie Delaunay wrote: >> This patch adds the description of new optional phy tuning properties >> for usbphyc phy sub nodes. >> >> Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> >> --- >> Changes in v2: >> - st,phy-tuning property removed >> - tuning properties are now put directly in each child node >> - tuning properties are no more free form text and their name reworked >> --- >> .../bindings/phy/phy-stm32-usbphyc.yaml | 126 ++++++++++++++++++ >> 1 file changed, 126 insertions(+) >> > > Running 'make dtbs_check' with the schema in this patch gives the > following warnings. Consider if they are expected or the schema is > incorrect. These may not be new warnings. > > Note that it is not yet a requirement to have 0 warnings for dtbs_check. > This will change in the future. > > Full log is available here: https://patchwork.ozlabs.org/patch/1536730 > > > usbphyc@5a006000: usb-phy@0: 'phy-supply' is a required property > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dt.yaml > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dt.yaml > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dt.yaml > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dt.yaml > arch/arm/boot/dts/stm32mp157c-lxa-mc1.dt.yaml > arch/arm/boot/dts/stm32mp157c-odyssey.dt.yaml > > usbphyc@5a006000: usb-phy@1: 'phy-supply' is a required property > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dt.yaml > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dt.yaml > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dt.yaml > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dt.yaml > arch/arm/boot/dts/stm32mp157c-lxa-mc1.dt.yaml > arch/arm/boot/dts/stm32mp157c-odyssey.dt.yaml > These warnings are due to the fact that usbphyc parent node is disabled in parent device tree (stm32mp151.dtsi) but not the "usb-phy" child nodes. These warnings are not introduced by this current patch "optional phy tuning properties" but anyway. The device trees mentioned don't enable usbphyc, so they don't have to set phy-supply in usbphyc child nodes. $ git diff arch/arm/boot/dts/stm32mp151.dtsi diff --git a/arch/arm/boot/dts/stm32mp151.dtsi b/arch/arm/boot/dts/stm32mp151.dtsi index bd289bf5d269..abef8b6be40a 100644 --- a/arch/arm/boot/dts/stm32mp151.dtsi +++ b/arch/arm/boot/dts/stm32mp151.dtsi @@ -1507,11 +1507,13 @@ usbphyc: usbphyc@5a006000 { usbphyc_port0: usb-phy@0 { #phy-cells = <0>; reg = <0>; + status = "disabled"; }; usbphyc_port1: usb-phy@1 { #phy-cells = <1>; reg = <1>; + status = "disabled"; }; }; Disable child nodes while parent node is already disabled fixes the warning. But it means to add status = "okay"; in child nodes everywhere usbphyc is enabled. Is it normal dtbs_check checks in child nodes when parent node is disabled? Regards, Amelie
On Wed, Oct 6, 2021 at 1:51 AM Amelie DELAUNAY <amelie.delaunay@foss.st.com> wrote: > > Hi Rob, > > On 10/6/21 12:45 AM, Rob Herring wrote: > > On Tue, 05 Oct 2021 17:24:52 +0200, Amelie Delaunay wrote: > >> This patch adds the description of new optional phy tuning properties > >> for usbphyc phy sub nodes. > >> > >> Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> > >> --- > >> Changes in v2: > >> - st,phy-tuning property removed > >> - tuning properties are now put directly in each child node > >> - tuning properties are no more free form text and their name reworked > >> --- > >> .../bindings/phy/phy-stm32-usbphyc.yaml | 126 ++++++++++++++++++ > >> 1 file changed, 126 insertions(+) > >> > > > > Running 'make dtbs_check' with the schema in this patch gives the > > following warnings. Consider if they are expected or the schema is > > incorrect. These may not be new warnings. > > > > Note that it is not yet a requirement to have 0 warnings for dtbs_check. > > This will change in the future. > > > > Full log is available here: https://patchwork.ozlabs.org/patch/1536730 > > > > > > usbphyc@5a006000: usb-phy@0: 'phy-supply' is a required property > > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dt.yaml > > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dt.yaml > > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dt.yaml > > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dt.yaml > > arch/arm/boot/dts/stm32mp157c-lxa-mc1.dt.yaml > > arch/arm/boot/dts/stm32mp157c-odyssey.dt.yaml > > > > usbphyc@5a006000: usb-phy@1: 'phy-supply' is a required property > > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-ctouch2.dt.yaml > > arch/arm/boot/dts/stm32mp157a-icore-stm32mp1-edimm2.2.dt.yaml > > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0.dt.yaml > > arch/arm/boot/dts/stm32mp157a-microgea-stm32mp1-microdev2.0-of7.dt.yaml > > arch/arm/boot/dts/stm32mp157c-lxa-mc1.dt.yaml > > arch/arm/boot/dts/stm32mp157c-odyssey.dt.yaml > > > > These warnings are due to the fact that usbphyc parent node is disabled > in parent device tree (stm32mp151.dtsi) but not the "usb-phy" child > nodes. These warnings are not introduced by this current patch "optional > phy tuning properties" but anyway. Yes, I said that may be the case. > The device trees mentioned don't > enable usbphyc, so they don't have to set phy-supply in usbphyc child nodes. > > $ git diff arch/arm/boot/dts/stm32mp151.dtsi > diff --git a/arch/arm/boot/dts/stm32mp151.dtsi > b/arch/arm/boot/dts/stm32mp151.dtsi > index bd289bf5d269..abef8b6be40a 100644 > --- a/arch/arm/boot/dts/stm32mp151.dtsi > +++ b/arch/arm/boot/dts/stm32mp151.dtsi > @@ -1507,11 +1507,13 @@ usbphyc: usbphyc@5a006000 { > usbphyc_port0: usb-phy@0 { > #phy-cells = <0>; > reg = <0>; > + status = "disabled"; > }; > > usbphyc_port1: usb-phy@1 { > #phy-cells = <1>; > reg = <1>; > + status = "disabled"; > }; > }; > > Disable child nodes while parent node is already disabled fixes the > warning. But it means to add status = "okay"; in child nodes everywhere > usbphyc is enabled. Presumably, you already have to add phy-supply everywhere. > Is it normal dtbs_check checks in child nodes when parent node is disabled? I'll look into doing that. Rob
On 10/6/21 2:38 PM, Rob Herring wrote: >> Disable child nodes while parent node is already disabled fixes the >> warning. But it means to add status = "okay"; in child nodes everywhere >> usbphyc is enabled. > Presumably, you already have to add phy-supply everywhere. > >> Is it normal dtbs_check checks in child nodes when parent node is disabled? > I'll look into doing that. Should I wait for your potential dtbs_check update or should I disable child nodes in .dtsi (and enable them along with parent node in .dts using usbphyc) ? Regards, Amelie
On Tue, Oct 05, 2021 at 05:24:52PM +0200, Amelie Delaunay wrote: > This patch adds the description of new optional phy tuning properties > for usbphyc phy sub nodes. > > Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> > --- > Changes in v2: > - st,phy-tuning property removed > - tuning properties are now put directly in each child node > - tuning properties are no more free form text and their name reworked > --- > .../bindings/phy/phy-stm32-usbphyc.yaml | 126 ++++++++++++++++++ > 1 file changed, 126 insertions(+) > > diff --git a/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml b/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml > index 3329f1d33a4f..c0f4dff2b8cb 100644 > --- a/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml > +++ b/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml > @@ -81,6 +81,116 @@ patternProperties: > properties: > vbus-supply: true > > + # It can be necessary to adjust the PHY settings to compensate parasitics, which can be due > + # to USB connector/receptacle, routing, ESD protection component,... Here is the list of > + # all optional parameters to tune the interface of the PHY (HS for High-Speed, FS for Full- > + # Speed, LS for Low-Speed) > + > + st,current-boost-milliamp: Not a documented unit. Use '-microamp'. > + description: Current boosting in mA > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 1 > + maximum: 2 > + > + st,no-lsfs-fb-cap: > + description: Disables the LS/FS feedback capacitor > + type: boolean > + > + st,decrease-hs-slew-rate: > + description: Decreases the HS driver slew rate by 10% > + type: boolean > + > + st,tune-hs-dc-level: > + description: Tunes the HS driver DC level You need '|' after 'description:' to retain the formatting you have here. > + - <0> normal level > + - <1> increases the level by 5 to 7 mV > + - <2> increases the level by 10 to 14 mV > + - <3> decreases the level by 5 to 7 mV > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 0 > + maximum: 3 > + default: 0 > + > + st,enable-fs-rftime-tuning: > + description: Enables the FS rise/fall tuning option > + type: boolean > + > + st,enable-hs-rftime-reduction: > + description: Enables the HS rise/fall reduction feature > + type: boolean > + > + st,trim-hs-current: > + description: Controls HS driver current trimming for choke compensation > + - <0> = 18.87 mA target current / nominal + 0% > + - <1> = 19.165 mA target current / nominal + 1.56% > + - <2> = 19.46 mA target current / nominal + 3.12% > + - <3> = 19.755 mA target current / nominal + 4.68% > + - <4> = 20.05 mA target current / nominal + 6.24% > + - <5> = 20.345 mA target current / nominal + 7.8% > + - <6> = 20.64 mA target current / nominal + 9.36% > + - <7> = 20.935 mA target current / nominal + 10.92% > + - <8> = 21.23 mA target current / nominal + 12.48% > + - <9> = 21.525 mA target current / nominal + 14.04% > + - <10> = 21.82 mA target current / nominal + 15.6% > + - <11> = 22.115 mA target current / nominal + 17.16% > + - <12> = 22.458 mA target current / nominal + 19.01% > + - <13> = 22.755 mA target current / nominal + 20.58% > + - <14> = 23.052 mA target current / nominal + 22.16% > + - <15> = 23.348 mA target current / nominal + 23.73% > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 0 > + maximum: 15 > + default: 0 > + > + st,trim-hs-impedance: > + description: Controls HS driver impedance tuning for choke compensation > + - <0> = no impedance offset > + - <1> = reduce the impedance by 2 ohms > + - <2> = reduce the impedance by 4 ohms > + - <3> = reduce the impedance by 6 ohms > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 0 > + maximum: 3 > + default: 0 > + > + st,tune-squelch-level: > + description: Tunes the squelch DC threshold value > + - <0> = no shift in threshold > + - <1> = threshold shift by +7 mV > + - <2> = threshold shift by -5 mV > + - <3> = threshold shift by +14 mV > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 0 > + maximum: 3 > + default: 0 > + > + st,enable-hs-rx-gain-eq: > + description: Enables the HS Rx gain equalizer > + type: boolean > + > + st,tune-hs-rx-offset: > + description: Adjusts the HS Rx offset > + - <0> = no offset > + - <1> = offset of +5 mV > + - <2> = offset of +10 mV > + - <3> = offset of -5 mV > + $ref: /schemas/types.yaml#/definitions/uint32 > + minimum: 0 > + maximum: 3 > + default: 0 > + > + st,no-hs-ftime-ctrl: > + description: Disables the HS fall time control of single ended signals during pre-emphasis > + type: boolean > + > + st,no-lsfs-sc: > + description: Disables the short circuit protection in LS/FS driver > + type: boolean > + > + st,enable-hs-tx-staggering: > + description: Enables the basic staggering in HS Tx mode > + type: boolean > + > allOf: > - if: > properties: > @@ -137,6 +247,14 @@ examples: > reg = <0>; > phy-supply = <&vdd_usb>; > #phy-cells = <0>; > + st,tune-hs-dc-level = <2>; > + st,enable-fs-rftime-tuning; > + st,enable-hs-rftime-reduction; > + st,trim-hs-current = <15>; > + st,trim-hs-impedance = <1>; > + st,tune-squelch-level = <3>; > + st,tune-hs-rx-offset = <2>; > + st,no-lsfs-sc; > connector { > compatible = "usb-a-connector"; > vbus-supply = <&vbus_sw>; > @@ -147,6 +265,14 @@ examples: > reg = <1>; > phy-supply = <&vdd_usb>; > #phy-cells = <1>; > + st,tune-hs-dc-level = <2>; > + st,enable-fs-rftime-tuning; > + st,enable-hs-rftime-reduction; > + st,trim-hs-current = <15>; > + st,trim-hs-impedance = <1>; > + st,tune-squelch-level = <3>; > + st,tune-hs-rx-offset = <2>; > + st,no-lsfs-sc; > }; > }; > ... > -- > 2.25.1 > >
On Wed, Oct 06, 2021 at 02:58:21PM +0200, Amelie DELAUNAY wrote: > > > On 10/6/21 2:38 PM, Rob Herring wrote: > > > Disable child nodes while parent node is already disabled fixes the > > > warning. But it means to add status = "okay"; in child nodes everywhere > > > usbphyc is enabled. > > Presumably, you already have to add phy-supply everywhere. > > >> Is it normal dtbs_check checks in child nodes when parent node is > disabled? > > I'll look into doing that. > > Should I wait for your potential dtbs_check update or should I disable child > nodes in .dtsi (and enable them along with parent node in .dts using > usbphyc) ? I pushed a fix to dt-validate for this. Rob
On 10/14/21 8:16 PM, Rob Herring wrote: > On Wed, Oct 06, 2021 at 02:58:21PM +0200, Amelie DELAUNAY wrote: >> >> >> On 10/6/21 2:38 PM, Rob Herring wrote: >>>> Disable child nodes while parent node is already disabled fixes the >>>> warning. But it means to add status = "okay"; in child nodes everywhere >>>> usbphyc is enabled. >>> Presumably, you already have to add phy-supply everywhere. >>> >> Is it normal dtbs_check checks in child nodes when parent node is >> disabled? >>> I'll look into doing that. >> >> Should I wait for your potential dtbs_check update or should I disable child >> nodes in .dtsi (and enable them along with parent node in .dts using >> usbphyc) ? > > I pushed a fix to dt-validate for this. Thanks! Amelie
diff --git a/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml b/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml index 3329f1d33a4f..c0f4dff2b8cb 100644 --- a/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml +++ b/Documentation/devicetree/bindings/phy/phy-stm32-usbphyc.yaml @@ -81,6 +81,116 @@ patternProperties: properties: vbus-supply: true + # It can be necessary to adjust the PHY settings to compensate parasitics, which can be due + # to USB connector/receptacle, routing, ESD protection component,... Here is the list of + # all optional parameters to tune the interface of the PHY (HS for High-Speed, FS for Full- + # Speed, LS for Low-Speed) + + st,current-boost-milliamp: + description: Current boosting in mA + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 1 + maximum: 2 + + st,no-lsfs-fb-cap: + description: Disables the LS/FS feedback capacitor + type: boolean + + st,decrease-hs-slew-rate: + description: Decreases the HS driver slew rate by 10% + type: boolean + + st,tune-hs-dc-level: + description: Tunes the HS driver DC level + - <0> normal level + - <1> increases the level by 5 to 7 mV + - <2> increases the level by 10 to 14 mV + - <3> decreases the level by 5 to 7 mV + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3 + default: 0 + + st,enable-fs-rftime-tuning: + description: Enables the FS rise/fall tuning option + type: boolean + + st,enable-hs-rftime-reduction: + description: Enables the HS rise/fall reduction feature + type: boolean + + st,trim-hs-current: + description: Controls HS driver current trimming for choke compensation + - <0> = 18.87 mA target current / nominal + 0% + - <1> = 19.165 mA target current / nominal + 1.56% + - <2> = 19.46 mA target current / nominal + 3.12% + - <3> = 19.755 mA target current / nominal + 4.68% + - <4> = 20.05 mA target current / nominal + 6.24% + - <5> = 20.345 mA target current / nominal + 7.8% + - <6> = 20.64 mA target current / nominal + 9.36% + - <7> = 20.935 mA target current / nominal + 10.92% + - <8> = 21.23 mA target current / nominal + 12.48% + - <9> = 21.525 mA target current / nominal + 14.04% + - <10> = 21.82 mA target current / nominal + 15.6% + - <11> = 22.115 mA target current / nominal + 17.16% + - <12> = 22.458 mA target current / nominal + 19.01% + - <13> = 22.755 mA target current / nominal + 20.58% + - <14> = 23.052 mA target current / nominal + 22.16% + - <15> = 23.348 mA target current / nominal + 23.73% + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 15 + default: 0 + + st,trim-hs-impedance: + description: Controls HS driver impedance tuning for choke compensation + - <0> = no impedance offset + - <1> = reduce the impedance by 2 ohms + - <2> = reduce the impedance by 4 ohms + - <3> = reduce the impedance by 6 ohms + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3 + default: 0 + + st,tune-squelch-level: + description: Tunes the squelch DC threshold value + - <0> = no shift in threshold + - <1> = threshold shift by +7 mV + - <2> = threshold shift by -5 mV + - <3> = threshold shift by +14 mV + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3 + default: 0 + + st,enable-hs-rx-gain-eq: + description: Enables the HS Rx gain equalizer + type: boolean + + st,tune-hs-rx-offset: + description: Adjusts the HS Rx offset + - <0> = no offset + - <1> = offset of +5 mV + - <2> = offset of +10 mV + - <3> = offset of -5 mV + $ref: /schemas/types.yaml#/definitions/uint32 + minimum: 0 + maximum: 3 + default: 0 + + st,no-hs-ftime-ctrl: + description: Disables the HS fall time control of single ended signals during pre-emphasis + type: boolean + + st,no-lsfs-sc: + description: Disables the short circuit protection in LS/FS driver + type: boolean + + st,enable-hs-tx-staggering: + description: Enables the basic staggering in HS Tx mode + type: boolean + allOf: - if: properties: @@ -137,6 +247,14 @@ examples: reg = <0>; phy-supply = <&vdd_usb>; #phy-cells = <0>; + st,tune-hs-dc-level = <2>; + st,enable-fs-rftime-tuning; + st,enable-hs-rftime-reduction; + st,trim-hs-current = <15>; + st,trim-hs-impedance = <1>; + st,tune-squelch-level = <3>; + st,tune-hs-rx-offset = <2>; + st,no-lsfs-sc; connector { compatible = "usb-a-connector"; vbus-supply = <&vbus_sw>; @@ -147,6 +265,14 @@ examples: reg = <1>; phy-supply = <&vdd_usb>; #phy-cells = <1>; + st,tune-hs-dc-level = <2>; + st,enable-fs-rftime-tuning; + st,enable-hs-rftime-reduction; + st,trim-hs-current = <15>; + st,trim-hs-impedance = <1>; + st,tune-squelch-level = <3>; + st,tune-hs-rx-offset = <2>; + st,no-lsfs-sc; }; }; ...
This patch adds the description of new optional phy tuning properties for usbphyc phy sub nodes. Signed-off-by: Amelie Delaunay <amelie.delaunay@foss.st.com> --- Changes in v2: - st,phy-tuning property removed - tuning properties are now put directly in each child node - tuning properties are no more free form text and their name reworked --- .../bindings/phy/phy-stm32-usbphyc.yaml | 126 ++++++++++++++++++ 1 file changed, 126 insertions(+)