Re: [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error

bhupesh.sharma
2023-05-22T09:03:34Z

On 5/22/23 1:22 AM, Dmitry Baryshkov <dmitry.baryshkov@linaro.org> wrote:
> Merge two allOf clauses, which sneaked in in two different patches.
>
> /home/lumag/Projects/Qcomm/kernel/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml:109:1: found duplicate key "allOf" with value "[]" (original value: "[]")
> /home/lumag/Projects/Qcomm/kernel/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml:109:1: [error] duplication of key "allOf" in mapping (key-duplicates)
> /home/lumag/Projects/Qcomm/kernel/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml:109:1: found duplicate key "allOf" with value "[]" (original value: "[]")
> /home/lumag/Projects/Qcomm/kernel/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml: ignoring, error parsing file
>
> Fixes: 2daece5eb51e ("dt-bindings: phy: qcom,qmp-usb: Drop legacy bindings and move to newer one (SM6115 & QCM2290)")
> Signed-off-by: Dmitry Baryshkov <dmitry.baryshkov@linaro.org>
> ---
> .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 28 ++++---------------
> 1 file changed, 5 insertions(+), 23 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> index 2c3e2ede6671..f99fbbcd68fb 100644
> --- a/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
> @@ -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:
> - |

Reviewed-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>

Thanks.