Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

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: 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>
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Reviewed-by: Bhupesh Sharma <bhupesh.sharma@linaro.org>
Link: https://lore.kernel.org/r/20230521195200.11967-1-dmitry.baryshkov@linaro.org
Signed-off-by: Vinod Koul <vkoul@kernel.org>

authored by

Dmitry Baryshkov and committed by
Vinod Koul
1eac0f95 50da4496

+5 -23
+5 -23
Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml
··· 89 89 compatible: 90 90 contains: 91 91 enum: 92 - - qcom,sa8775p-qmp-usb3-uni-phy 93 - - qcom,sc8280xp-qmp-usb3-uni-phy 94 - then: 95 - properties: 96 - clocks: 97 - maxItems: 4 98 - clock-names: 99 - items: 100 - - const: aux 101 - - const: ref 102 - - const: com_aux 103 - - const: pipe 104 - required: 105 - - power-domains 106 - 107 - additionalProperties: false 108 - 109 - allOf: 110 - - if: 111 - properties: 112 - compatible: 113 - contains: 114 - enum: 115 92 - qcom,qcm2290-qmp-usb3-phy 116 93 - qcom,sm6115-qmp-usb3-phy 117 94 then: ··· 107 130 compatible: 108 131 contains: 109 132 enum: 133 + - qcom,sa8775p-qmp-usb3-uni-phy 110 134 - qcom,sc8280xp-qmp-usb3-uni-phy 111 135 then: 112 136 properties: ··· 119 141 - const: ref 120 142 - const: com_aux 121 143 - const: pipe 144 + required: 145 + - power-domains 146 + 147 + additionalProperties: false 122 148 123 149 examples: 124 150 - |