[PATCH 0/2] dt-bindings: regulator: Fix uniphier descriptions

[PATCH 0/2] dt-bindings: regulator: Fix uniphier descriptions

[Kunihiko Hayashi]

This series fixes dt-schema descriptions for regulators implemented in
UniPhier SoCs.

Kunihiko Hayashi (2):
  dt-bindings: regulator: uniphier: Clean up clocks, resets, and their
    names using compatible string
  dt-bindings: regulator: uniphier: Use unevaluatedProperties

 .../socionext,uniphier-regulator.yaml         | 57 +++++++++++++------
 1 file changed, 39 insertions(+), 18 deletions(-)

-- 
2.25.1

[PATCH 1/2] dt-bindings: regulator: uniphier: Clean up clocks, resets, and their names using compatible string

[Kunihiko Hayashi]

Instead of "oneOf:" choices, use "allOf:" and "if:" to define clocks,
resets, and their names that can be taken by the compatible string.

The order of clock-names and reset-names doesn't change here.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 .../socionext,uniphier-regulator.yaml         | 55 +++++++++++++------
 1 file changed, 38 insertions(+), 17 deletions(-)

diff --git a/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml b/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
index 1218f21ba320..cc40cf72a149 100644
--- a/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
@@ -14,9 +14,6 @@ description: |
 maintainers:
   - Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
 
-allOf:
-  - $ref: "regulator.yaml#"
-
 # USB3 Controller
 
 properties:
@@ -36,25 +33,49 @@ properties:
     minItems: 1
     maxItems: 2
 
-  clock-names:
-    oneOf:
-      - items:          # for Pro4, Pro5
-          - const: gio
-          - const: link
-      - items:          # for others
-          - const: link
+  clock-names: true
 
   resets:
     minItems: 1
     maxItems: 2
 
-  reset-names:
-    oneOf:
-      - items:          # for Pro4, Pro5
-          - const: gio
-          - const: link
-      - items:
-          - const: link
+  reset-names: true
+
+allOf:
+  - $ref: "regulator.yaml#"
+  - if:
+      properties:
+        compatible:
+          contains:
+            enum:
+              - socionext,uniphier-pro4-usb3-regulator
+              - socionext,uniphier-pro5-usb3-regulator
+    then:
+      properties:
+        clocks:
+          minItems: 2
+          maxItems: 2
+        clock-names:
+          items:
+            - const: gio
+            - const: link
+        resets:
+          minItems: 2
+          maxItems: 2
+        reset-names:
+          items:
+            - const: gio
+            - const: link
+    else:
+      properties:
+        clocks:
+          maxItems: 1
+        clock-names:
+          const: link
+        resets:
+          maxItems: 1
+        reset-names:
+          const: link
 
 additionalProperties: false
 
-- 
2.25.1

Re: [PATCH 1/2] dt-bindings: regulator: uniphier: Clean up clocks, resets, and their names using compatible string

[Rob Herring]

On Tue, 05 Apr 2022 16:55:02 +0900, Kunihiko Hayashi wrote:
> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clocks,
> resets, and their names that can be taken by the compatible string.
> 
> The order of clock-names and reset-names doesn't change here.
> 
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
>  .../socionext,uniphier-regulator.yaml         | 55 +++++++++++++------
>  1 file changed, 38 insertions(+), 17 deletions(-)
> 

Reviewed-by: Rob Herring <robh@kernel.org>

[PATCH 2/2] dt-bindings: regulator: uniphier: Use unevaluatedProperties

[Kunihiko Hayashi]

This refers common bindings, so this is preferred for
unevaluatedProperties instead of additionalProperties.

Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
---
 .../bindings/regulator/socionext,uniphier-regulator.yaml        | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml b/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
index cc40cf72a149..75087c6e001c 100644
--- a/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
+++ b/Documentation/devicetree/bindings/regulator/socionext,uniphier-regulator.yaml
@@ -77,7 +77,7 @@ allOf:
         reset-names:
           const: link
 
-additionalProperties: false
+unevaluatedProperties: false
 
 required:
   - compatible
-- 
2.25.1

Re: [PATCH 2/2] dt-bindings: regulator: uniphier: Use unevaluatedProperties

[Rob Herring]

On Tue, 05 Apr 2022 16:55:03 +0900, Kunihiko Hayashi wrote:
> This refers common bindings, so this is preferred for
> unevaluatedProperties instead of additionalProperties.
> 
> Signed-off-by: Kunihiko Hayashi <hayashi.kunihiko@socionext.com>
> ---
>  .../bindings/regulator/socionext,uniphier-regulator.yaml        | 2 +-
>  1 file changed, 1 insertion(+), 1 deletion(-)
> 

Acked-by: Rob Herring <robh@kernel.org>

Re: [PATCH 0/2] dt-bindings: regulator: Fix uniphier descriptions

[Mark Brown]

On Tue, 5 Apr 2022 16:55:01 +0900, Kunihiko Hayashi wrote:
> This series fixes dt-schema descriptions for regulators implemented in
> UniPhier SoCs.
> 
> Kunihiko Hayashi (2):
>   dt-bindings: regulator: uniphier: Clean up clocks, resets, and their
>     names using compatible string
>   dt-bindings: regulator: uniphier: Use unevaluatedProperties
> 
> [...]

Applied to

   https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git for-next

Thanks!

[1/2] dt-bindings: regulator: uniphier: Clean up clocks, resets, and their names using compatible string
      commit: 2eacc8479c1f6610288f619a23c374502176ca66
[2/2] dt-bindings: regulator: uniphier: Use unevaluatedProperties
      commit: 65adf7234a0dd68217f58715b0b5fd940b630529

All being well this means that it will be integrated into the linux-next
tree (usually sometime in the next 24 hours) and sent to Linus during
the next merge window (or sooner if it is a bug fix), however if
problems are discovered then the patch may be dropped or reverted.

You may get further e-mails resulting from automated or manual testing
and review of the tree, please engage with people reporting problems and
send followup patches addressing any issues that are reported if needed.

If any updates are required or you are submitting further changes they
should be sent as incremental updates against current git, existing
patches will not be replaced.

Please add any relevant lists and maintainers to the CCs when replying
to this mail.

Thanks,
Mark