Commit 1eac0f95 authored by Dmitry Baryshkov's avatar Dmitry Baryshkov Committed by Vinod Koul
Browse files

dt-bindings: phy: qcom,qmp-usb: fix bindings error 



Merge two allOf clauses, which sneaked in in two different patches.

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml:109:1: found duplicate key "allOf" with value "[]" (original value: "[]")
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml:109:1: [error] duplication of key "allOf" in mapping (key-duplicates)
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml:109:1: found duplicate key "allOf" with value "[]" (original value: "[]")
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml: ignoring, error parsing file

Fixes: 2daece5e ("dt-bindings: phy: qcom,qmp-usb: Drop legacy bindings and move to newer one (SM6115 & QCM2290)")
Signed-off-by: default avatarDmitry Baryshkov <dmitry.baryshkov@linaro.org>
Reviewed-by: default avatarConor Dooley <conor.dooley@microchip.com>
Reviewed-by: default avatarBhupesh Sharma <bhupesh.sharma@linaro.org>
Link: https://lore.kernel.org/r/20230521195200.11967-1-dmitry.baryshkov@linaro.org


Signed-off-by: default avatarVinod Koul <vkoul@kernel.org>
parent 50da4496

Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml

+5 −23
Original line number Diff line number Diff line
@@ -84,29 +84,6 @@ allOf: 
            - const: cfg_ahb

            - const: pipe



  - if:

      properties:

        compatible:

          contains:

            enum:

              - qcom,sa8775p-qmp-usb3-uni-phy

              - qcom,sc8280xp-qmp-usb3-uni-phy

    then:

      properties:

        clocks:

          maxItems: 4

        clock-names:

          items:

            - const: aux

            - const: ref

            - const: com_aux

            - const: pipe

      required:

        - power-domains



additionalProperties: false



allOf:

  - if:

      properties:

        compatible:
@@ -130,6 +107,7 @@ allOf: 
        compatible:

          contains:

            enum:

              - qcom,sa8775p-qmp-usb3-uni-phy

              - qcom,sc8280xp-qmp-usb3-uni-phy

    then:

      properties:
@@ -141,6 +119,10 @@ allOf: 
            - const: ref

            - const: com_aux

            - const: pipe

      required:

        - power-domains



additionalProperties: false



examples:

  - |