| lists.openwall.net | lists / announce owl-users owl-dev john-users john-dev passwdqc-users yescrypt popa3d-users / oss-security kernel-hardening musl sabotage tlsify passwords / crypt-dev xvendor / Bugtraq Full-Disclosure linux-kernel linux-netdev linux-ext4 linux-hardening linux-cve-announce PHC | |
|
Open Source and information security mailing list archives
| ||
|
Message-ID: <a784ed61-965a-5c68-c2dd-3340cf18c7b5@linaro.org>
Date: Wed, 30 Mar 2022 19:40:33 +0200
From: Krzysztof Kozlowski <krzysztof.kozlowski@...aro.org>
To: Kunihiko Hayashi <hayashi.kunihiko@...ionext.com>,
Vinod Koul <vkoul@...nel.org>,
Kishon Vijay Abraham I <kishon@...com>,
Rob Herring <robh+dt@...nel.org>,
Krzysztof Kozlowski <krzk+dt@...nel.org>
Cc: Masami Hiramatsu <mhiramat@...nel.org>,
linux-phy@...ts.infradead.org, devicetree@...r.kernel.org,
linux-arm-kernel@...ts.infradead.org, linux-kernel@...r.kernel.org
Subject: Re: [PATCH v3 5/5] dt-bindings: phy: uniphier: Clean up clocks,
resets, and their names using compatible string
On 30/03/2022 12:55, Kunihiko Hayashi wrote:
> Instead of "oneOf:" choices, use "allOf:" and "if:" to define clocks,
> clock-names, resets, and reset-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@...ionext.com>
> ---
> .../phy/socionext,uniphier-ahci-phy.yaml | 90 +++++++++++++-----
> .../phy/socionext,uniphier-pcie-phy.yaml | 47 ++++++---
> .../phy/socionext,uniphier-usb3hs-phy.yaml | 93 ++++++++++++++----
> .../phy/socionext,uniphier-usb3ss-phy.yaml | 95 +++++++++++++++----
> 4 files changed, 251 insertions(+), 74 deletions(-)
>
(...)
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> index 1bbd164f2527..21e4414eea60 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3hs-phy.yaml
> @@ -34,30 +34,12 @@ properties:
> minItems: 2
> maxItems: 3
>
> - clock-names:
> - oneOf:
> - - items: # for Pro5
> - - const: gio
> - - const: link
> - - items: # for PXs3 with phy-ext
> - - const: link
> - - const: phy
> - - const: phy-ext
> - - items: # for others
> - - const: link
> - - const: phy
> + clock-names: true
>
> resets:
> maxItems: 2
>
> - reset-names:
> - oneOf:
> - - items: # for Pro5
> - - const: gio
> - - const: link
> - - items: # for others
> - - const: link
> - - const: phy
> + reset-names: true
>
> vbus-supply:
> description: A phandle to the regulator for USB VBUS
> @@ -80,6 +62,77 @@ properties:
> required for each port, if any one is omitted, the trimming data
> of the port will not be set at all.
>
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + const: socionext,uniphier-pro5-usb3-hsphy
> + 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
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - socionext,uniphier-pxs2-usb3-hsphy
> + - socionext,uniphier-ld20-usb3-hsphy
> + then:
> + properties:
> + clocks:
> + minItems: 2
> + maxItems: 2
> + clock-names:
> + items:
> + - const: link
> + - const: phy
> + resets:
> + minItems: 2
> + maxItems: 2
> + reset-names:
> + items:
> + - const: link
> + - const: phy
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - socionext,uniphier-pxs3-usb3-hsphy
> + - socionext,uniphier-nx1-usb3-hsphy
> + then:
> + properties:
> + clocks:
> + minItems: 2
Why minItems:2? Is the last phy-ext clock optional?
> + maxItems: 3
> + clock-names:
> + minItems: 2
> + items:
> + - const: link
> + - const: phy
> + - const: phy-ext
> + resets:
> + minItems: 2
> + maxItems: 2
> + reset-names:
> + items:
> + - const: link
> + - const: phy
> +
> required:
> - compatible
> - reg
> diff --git a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
> index 06c957d52d23..4c26d2d2303d 100644
> --- a/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
> +++ b/Documentation/devicetree/bindings/phy/socionext,uniphier-usb3ss-phy.yaml
> @@ -35,34 +35,89 @@ properties:
> minItems: 2
> maxItems: 3
>
> - clock-names:
> - oneOf:
> - - items: # for Pro4, Pro5
> - - const: gio
> - - const: link
> - - items: # for PXs3 with phy-ext
> - - const: link
> - - const: phy
> - - const: phy-ext
> - - items: # for others
> - - const: link
> - - const: phy
> + clock-names: true
>
> resets:
> maxItems: 2
>
> - reset-names:
> - oneOf:
> - - items: # for Pro4,Pro5
> - - const: gio
> - - const: link
> - - items: # for others
> - - const: link
> - - const: phy
> + reset-names: true
>
> vbus-supply:
> description: A phandle to the regulator for USB VBUS, only for USB host
>
> +allOf:
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - socionext,uniphier-pro4-usb3-ssphy
> + - socionext,uniphier-pro5-usb3-ssphy
> + 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
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - socionext,uniphier-pxs2-usb3-ssphy
> + - socionext,uniphier-ld20-usb3-ssphy
> + then:
> + properties:
> + clocks:
> + minItems: 2
> + maxItems: 2
> + clock-names:
> + items:
> + - const: link
> + - const: phy
> + resets:
> + minItems: 2
> + maxItems: 2
> + reset-names:
> + items:
> + - const: link
> + - const: phy
> + - if:
> + properties:
> + compatible:
> + contains:
> + enum:
> + - socionext,uniphier-pxs3-usb3-ssphy
> + - socionext,uniphier-nx1-usb3-ssphy
> + then:
> + properties:
> + clocks:
> + minItems: 2
Same question as above.
> + maxItems: 3
> + clock-names:
> + minItems: 2
> + items:
> + - const: link
> + - const: phy
> + - const: phy-ext
> + resets:
> + minItems: 2
> + maxItems: 2
> + reset-names:
> + items:
> + - const: link
> + - const: phy
> +
> required:
> - compatible
> - reg
Best regards,
Krzysztof
Powered by blists - more mailing lists