| 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: <20210713194728.GA3229000@roeck-us.net>
Date: Tue, 13 Jul 2021 12:47:28 -0700
From: Guenter Roeck <linux@...ck-us.net>
To: Rob Herring <robh@...nel.org>
Cc: devicetree@...r.kernel.org, linux-kernel@...r.kernel.org,
Jean Delvare <jdelvare@...e.com>,
Kishon Vijay Abraham I <kishon@...com>,
Vinod Koul <vkoul@...nel.org>,
Saravanan Sekar <sravanhome@...il.com>,
Mark Brown <broonie@...nel.org>,
Jagan Teki <jagan@...rulasolutions.com>,
Troy Kisky <troy.kisky@...ndarydevices.com>,
linux-hwmon@...r.kernel.org, linux-phy@...ts.infradead.org,
linux-spi@...r.kernel.org
Subject: Re: [PATCH] dt-bindings: Move fixed string 'patternProperties' to
'properties'
On Tue, Jul 13, 2021 at 01:35:14PM -0600, Rob Herring wrote:
> There's no need for fixed strings to be under 'patternProperties', so move
> them under 'properties' instead.
>
> Cc: Jean Delvare <jdelvare@...e.com>
> Cc: Guenter Roeck <linux@...ck-us.net>
> Cc: Kishon Vijay Abraham I <kishon@...com>
> Cc: Vinod Koul <vkoul@...nel.org>
> Cc: Saravanan Sekar <sravanhome@...il.com>
> Cc: Mark Brown <broonie@...nel.org>
> Cc: Jagan Teki <jagan@...rulasolutions.com>
> Cc: Troy Kisky <troy.kisky@...ndarydevices.com>
> Cc: linux-hwmon@...r.kernel.org
> Cc: linux-phy@...ts.infradead.org
> Cc: linux-spi@...r.kernel.org
> Signed-off-by: Rob Herring <robh@...nel.org>
> ---
> .../devicetree/bindings/hwmon/adt7475.yaml | 22 ++++----
Acked-by: Guenter Roeck <linux@...ck-us.net>
> .../bindings/phy/ti,phy-j721e-wiz.yaml | 56 +++++++++----------
> .../bindings/regulator/mps,mpq7920.yaml | 6 +-
> .../regulator/nxp,pf8x00-regulator.yaml | 3 +-
> .../bindings/spi/spi-controller.yaml | 32 +++++------
> 5 files changed, 60 insertions(+), 59 deletions(-)
>
> diff --git a/Documentation/devicetree/bindings/hwmon/adt7475.yaml b/Documentation/devicetree/bindings/hwmon/adt7475.yaml
> index ad0ec9f35bd8..7d9c083632b9 100644
> --- a/Documentation/devicetree/bindings/hwmon/adt7475.yaml
> +++ b/Documentation/devicetree/bindings/hwmon/adt7475.yaml
> @@ -39,17 +39,7 @@ properties:
> reg:
> maxItems: 1
>
> -patternProperties:
> - "^adi,bypass-attenuator-in[0-4]$":
> - description: |
> - Configures bypassing the individual voltage input attenuator. If
> - set to 1 the attenuator is bypassed if set to 0 the attenuator is
> - not bypassed. If the property is absent then the attenuator
> - retains it's configuration from the bios/bootloader.
> - $ref: /schemas/types.yaml#/definitions/uint32
> - enum: [0, 1]
> -
> - "^adi,pwm-active-state$":
> + adi,pwm-active-state:
> description: |
> Integer array, represents the active state of the pwm outputs If set to 0
> the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
> @@ -61,6 +51,16 @@ patternProperties:
> enum: [0, 1]
> default: 1
>
> +patternProperties:
> + "^adi,bypass-attenuator-in[0-4]$":
> + description: |
> + Configures bypassing the individual voltage input attenuator. If
> + set to 1 the attenuator is bypassed if set to 0 the attenuator is
> + not bypassed. If the property is absent then the attenuator
> + retains it's configuration from the bios/bootloader.
> + $ref: /schemas/types.yaml#/definitions/uint32
> + enum: [0, 1]
> +
> required:
> - compatible
> - reg
> diff --git a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> index 5272b6f284ba..dcd63908aeae 100644
> --- a/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> +++ b/Documentation/devicetree/bindings/phy/ti,phy-j721e-wiz.yaml
> @@ -77,6 +77,34 @@ properties:
> Type-C spec states minimum CC pin debounce of 100 ms and maximum
> of 200 ms. However, some solutions might need more than 200 ms.
>
> + refclk-dig:
> + type: object
> + description: |
> + WIZ node should have subnode for refclk_dig to select the reference
> + clock source for the reference clock used in the PHY and PMA digital
> + logic.
> + properties:
> + clocks:
> + minItems: 2
> + maxItems: 4
> + description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
> + the inputs to refclk_dig
> +
> + "#clock-cells":
> + const: 0
> +
> + assigned-clocks:
> + maxItems: 1
> +
> + assigned-clock-parents:
> + maxItems: 1
> +
> + required:
> + - clocks
> + - "#clock-cells"
> + - assigned-clocks
> + - assigned-clock-parents
> +
> patternProperties:
> "^pll[0|1]-refclk$":
> type: object
> @@ -121,34 +149,6 @@ patternProperties:
> - clocks
> - "#clock-cells"
>
> - "^refclk-dig$":
> - type: object
> - description: |
> - WIZ node should have subnode for refclk_dig to select the reference
> - clock source for the reference clock used in the PHY and PMA digital
> - logic.
> - properties:
> - clocks:
> - minItems: 2
> - maxItems: 4
> - description: Phandle to two (Torrent) or four (Sierra) clock nodes representing
> - the inputs to refclk_dig
> -
> - "#clock-cells":
> - const: 0
> -
> - assigned-clocks:
> - maxItems: 1
> -
> - assigned-clock-parents:
> - maxItems: 1
> -
> - required:
> - - clocks
> - - "#clock-cells"
> - - assigned-clocks
> - - assigned-clock-parents
> -
> "^serdes@[0-9a-f]+$":
> type: object
> description: |
> diff --git a/Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml b/Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
> index 12b8963615c3..c2e8c54e5311 100644
> --- a/Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
> +++ b/Documentation/devicetree/bindings/regulator/mps,mpq7920.yaml
> @@ -36,12 +36,12 @@ properties:
> switching frequency must be one of following corresponding value
> 1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz
>
> - patternProperties:
> - "^ldo[1-4]$":
> + ldortc:
> type: object
> $ref: regulator.yaml#
>
> - "^ldortc$":
> + patternProperties:
> + "^ldo[1-4]$":
> type: object
> $ref: regulator.yaml#
>
> diff --git a/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml b/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
> index 8761437ed8ad..aabf50f5b39e 100644
> --- a/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
> +++ b/Documentation/devicetree/bindings/regulator/nxp,pf8x00-regulator.yaml
> @@ -83,7 +83,8 @@ properties:
>
> unevaluatedProperties: false
>
> - "^vsnvs$":
> + properties:
> + vsnvs:
> type: object
> $ref: regulator.yaml#
> description:
> diff --git a/Documentation/devicetree/bindings/spi/spi-controller.yaml b/Documentation/devicetree/bindings/spi/spi-controller.yaml
> index faef4f6f55b8..8246891602e7 100644
> --- a/Documentation/devicetree/bindings/spi/spi-controller.yaml
> +++ b/Documentation/devicetree/bindings/spi/spi-controller.yaml
> @@ -79,22 +79,7 @@ properties:
> description:
> The SPI controller acts as a slave, instead of a master.
>
> -allOf:
> - - if:
> - not:
> - required:
> - - spi-slave
> - then:
> - properties:
> - "#address-cells":
> - const: 1
> - else:
> - properties:
> - "#address-cells":
> - const: 0
> -
> -patternProperties:
> - "^slave$":
> + slave:
> type: object
>
> properties:
> @@ -105,6 +90,7 @@ patternProperties:
> required:
> - compatible
>
> +patternProperties:
> "^.*@[0-9a-f]+$":
> type: object
>
> @@ -180,6 +166,20 @@ patternProperties:
> - compatible
> - reg
>
> +allOf:
> + - if:
> + not:
> + required:
> + - spi-slave
> + then:
> + properties:
> + "#address-cells":
> + const: 1
> + else:
> + properties:
> + "#address-cells":
> + const: 0
> +
> additionalProperties: true
>
> examples:
> --
> 2.27.0
>
Powered by blists - more mailing lists