| Message ID | 20221223161835.112079-1-krzysztof.kozlowski@linaro.org |
|---|---|
| State | Accepted |
| Commit | 9160fb7c39a1e7456e309dbe360b5abbafd4b295 |
| Headers | show |
| Series | [1/4] dt-bindings: phy: qcom,usb-snps-femto-v2: use fallback compatibles | expand |
On Fri, 23 Dec 2022 17:18:32 +0100, Krzysztof Kozlowski wrote: > Document SoC-specific compatibles with generic fallback (e.g. > qcom,usb-snps-hs-7nm-phy) already used in DTSI. Add SoC-specific > compatibles for PHY on SDX55 and SDX65. > > This disallows usage of the qcom,usb-snps-hs-5nm-phy and > qcom,usb-snps-hs-7nm-phy generic compatibles alone. Do not touch > remaining two compatibles - qcom,usb-snps-femto-v2-phy and > qcom,sc8180x-usb-hs-phy - because there are no upstream users, so not > sure what was the intention for them. > > [...] Applied, thanks! [4/4] arm64: dts: qcom: sm8350: align MMC node names with DT schema commit: 06a0676b5de9221537156957b90b2b69dfceebba Best regards,
On Fri, 23 Dec 2022 17:18:32 +0100, Krzysztof Kozlowski wrote: > Document SoC-specific compatibles with generic fallback (e.g. > qcom,usb-snps-hs-7nm-phy) already used in DTSI. Add SoC-specific > compatibles for PHY on SDX55 and SDX65. > > This disallows usage of the qcom,usb-snps-hs-5nm-phy and > qcom,usb-snps-hs-7nm-phy generic compatibles alone. Do not touch > remaining two compatibles - qcom,usb-snps-femto-v2-phy and > qcom,sc8180x-usb-hs-phy - because there are no upstream users, so not > sure what was the intention for them. > > This fixes warnings like: > > sa8295p-adp.dtb: phy@88e5000: compatible: 'oneOf' conditional failed, one must be fixed: > ['qcom,sc8280xp-usb-hs-phy', 'qcom,usb-snps-hs-5nm-phy'] is too long > 'qcom,sc8280xp-usb-hs-phy' is not one of ['qcom,sm8150-usb-hs-phy', 'qcom,sm8250-usb-hs-phy', 'qcom,sm8350-usb-hs-phy', 'qcom,sm8450-usb-hs-phy'] > 'qcom,usb-snps-hs-7nm-phy' was expected > > Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> > --- > .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 33 +++++++++++-------- > 1 file changed, 20 insertions(+), 13 deletions(-) > Acked-by: Rob Herring <robh@kernel.org>
diff --git a/Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml b/Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml index 68e70961beb2..85d405e028b9 100644 --- a/Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml +++ b/Documentation/devicetree/bindings/phy/qcom,usb-snps-femto-v2.yaml @@ -14,18 +14,25 @@ description: | properties: compatible: - enum: - - qcom,usb-snps-hs-5nm-phy - - qcom,usb-snps-hs-7nm-phy - - qcom,sc7280-usb-hs-phy - - qcom,sc8180x-usb-hs-phy - - qcom,sc8280xp-usb-hs-phy - - qcom,sm6375-usb-hs-phy - - qcom,sm8150-usb-hs-phy - - qcom,sm8250-usb-hs-phy - - qcom,sm8350-usb-hs-phy - - qcom,sm8450-usb-hs-phy - - qcom,usb-snps-femto-v2-phy + oneOf: + - enum: + - qcom,sc8180x-usb-hs-phy + - qcom,usb-snps-femto-v2-phy + - items: + - enum: + - qcom,sc8280xp-usb-hs-phy + - const: qcom,usb-snps-hs-5nm-phy + - items: + - enum: + - qcom,sc7280-usb-hs-phy + - qcom,sdx55-usb-hs-phy + - qcom,sdx65-usb-hs-phy + - qcom,sm6375-usb-hs-phy + - qcom,sm8150-usb-hs-phy + - qcom,sm8250-usb-hs-phy + - qcom,sm8350-usb-hs-phy + - qcom,sm8450-usb-hs-phy + - const: qcom,usb-snps-hs-7nm-phy reg: maxItems: 1 @@ -160,7 +167,7 @@ examples: #include <dt-bindings/clock/qcom,rpmh.h> #include <dt-bindings/clock/qcom,gcc-sm8150.h> phy@88e2000 { - compatible = "qcom,sm8150-usb-hs-phy"; + compatible = "qcom,sm8150-usb-hs-phy", "qcom,usb-snps-hs-7nm-phy"; reg = <0x088e2000 0x400>; #phy-cells = <0>;
Document SoC-specific compatibles with generic fallback (e.g. qcom,usb-snps-hs-7nm-phy) already used in DTSI. Add SoC-specific compatibles for PHY on SDX55 and SDX65. This disallows usage of the qcom,usb-snps-hs-5nm-phy and qcom,usb-snps-hs-7nm-phy generic compatibles alone. Do not touch remaining two compatibles - qcom,usb-snps-femto-v2-phy and qcom,sc8180x-usb-hs-phy - because there are no upstream users, so not sure what was the intention for them. This fixes warnings like: sa8295p-adp.dtb: phy@88e5000: compatible: 'oneOf' conditional failed, one must be fixed: ['qcom,sc8280xp-usb-hs-phy', 'qcom,usb-snps-hs-5nm-phy'] is too long 'qcom,sc8280xp-usb-hs-phy' is not one of ['qcom,sm8150-usb-hs-phy', 'qcom,sm8250-usb-hs-phy', 'qcom,sm8350-usb-hs-phy', 'qcom,sm8450-usb-hs-phy'] 'qcom,usb-snps-hs-7nm-phy' was expected Signed-off-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org> --- .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 33 +++++++++++-------- 1 file changed, 20 insertions(+), 13 deletions(-)