* [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error
@ 2023-05-21 19:52 Dmitry Baryshkov
2023-05-22 9:02 ` bhupesh.sharma
` (2 more replies)
0 siblings, 3 replies; 5+ messages in thread
From: Dmitry Baryshkov @ 2023-05-21 19:52 UTC (permalink / raw)
To: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski
Cc: Philipp Zabel, linux-arm-msm, linux-phy, devicetree,
Bhupesh Sharma
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:
- |
--
2.39.2
^ permalink raw reply related [flat|nested] 5+ messages in thread* Re: [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error
2023-05-21 19:52 [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error Dmitry Baryshkov
@ 2023-05-22 9:02 ` bhupesh.sharma
2023-05-22 12:18 ` Conor Dooley
2023-05-30 16:39 ` Vinod Koul
2 siblings, 0 replies; 5+ messages in thread
From: bhupesh.sharma @ 2023-05-22 9:02 UTC (permalink / raw)
To: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Philipp Zabel, linux-arm-msm, linux-phy,
devicetree
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.
^ permalink raw reply [flat|nested] 5+ messages in thread* Re: [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error
2023-05-21 19:52 [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error Dmitry Baryshkov
2023-05-22 9:02 ` bhupesh.sharma
@ 2023-05-22 12:18 ` Conor Dooley
2023-05-24 15:25 ` Conor Dooley
2023-05-30 16:39 ` Vinod Koul
2 siblings, 1 reply; 5+ messages in thread
From: Conor Dooley @ 2023-05-22 12:18 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio, Vinod Koul,
Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski,
Philipp Zabel, linux-arm-msm, linux-phy, devicetree,
Bhupesh Sharma
[-- Attachment #1: Type: text/plain, Size: 1039 bytes --]
On Sun, May 21, 2023 at 10:52:00PM +0300, Dmitry Baryshkov 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
^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
You may as well trim at least that from the file paths, if not more.
That's w/e though,
Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Thanks,
Conor.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error
2023-05-22 12:18 ` Conor Dooley
@ 2023-05-24 15:25 ` Conor Dooley
0 siblings, 0 replies; 5+ messages in thread
From: Conor Dooley @ 2023-05-24 15:25 UTC (permalink / raw)
To: Conor Dooley
Cc: Dmitry Baryshkov, Andy Gross, Bjorn Andersson, Konrad Dybcio,
Vinod Koul, Kishon Vijay Abraham I, Rob Herring,
Krzysztof Kozlowski, Philipp Zabel, linux-arm-msm, linux-phy,
devicetree, Bhupesh Sharma
[-- Attachment #1: Type: text/plain, Size: 1206 bytes --]
Vinod,
On Mon, May 22, 2023 at 01:18:24PM +0100, Conor Dooley wrote:
> On Sun, May 21, 2023 at 10:52:00PM +0300, Dmitry Baryshkov 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
>
> ^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^^
> You may as well trim at least that from the file paths, if not more.
> That's w/e though,
> Reviewed-by: Conor Dooley <conor.dooley@microchip.com>
Could you pick this up please to unbreak dt_binding_check in next?
Thanks,
Conor.
[-- Attachment #2: signature.asc --]
[-- Type: application/pgp-signature, Size: 228 bytes --]
^ permalink raw reply [flat|nested] 5+ messages in thread
* Re: [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error
2023-05-21 19:52 [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error Dmitry Baryshkov
2023-05-22 9:02 ` bhupesh.sharma
2023-05-22 12:18 ` Conor Dooley
@ 2023-05-30 16:39 ` Vinod Koul
2 siblings, 0 replies; 5+ messages in thread
From: Vinod Koul @ 2023-05-30 16:39 UTC (permalink / raw)
To: Dmitry Baryshkov
Cc: Andy Gross, Bjorn Andersson, Konrad Dybcio,
Kishon Vijay Abraham I, Rob Herring, Krzysztof Kozlowski,
Philipp Zabel, linux-arm-msm, linux-phy, devicetree,
Bhupesh Sharma
On 21-05-23, 22:52, Dmitry Baryshkov 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
Applied, thanks
--
~Vinod
^ permalink raw reply [flat|nested] 5+ messages in thread
end of thread, other threads:[~2023-05-30 16:39 UTC | newest]
Thread overview: 5+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2023-05-21 19:52 [PATCH] dt-bindings: phy: qcom,qmp-usb: fix bindings error Dmitry Baryshkov
2023-05-22 9:02 ` bhupesh.sharma
2023-05-22 12:18 ` Conor Dooley
2023-05-24 15:25 ` Conor Dooley
2023-05-30 16:39 ` Vinod Koul
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox