Commit f88321a3 authored by Rob Herring's avatar Rob Herring

dt-bindings: Move fixed string 'patternProperties' to 'properties'

There's no need for fixed strings to be under 'patternProperties', so move
them under 'properties' instead.

Cc: Jean Delvare <jdelvare@suse.com>
Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Kishon Vijay Abraham I <kishon@ti.com>
Cc: Vinod Koul <vkoul@kernel.org>
Cc: Saravanan Sekar <sravanhome@gmail.com>
Cc: Mark Brown <broonie@kernel.org>
Cc: Jagan Teki <jagan@amarulasolutions.com>
Cc: Troy Kisky <troy.kisky@boundarydevices.com>
Cc: linux-hwmon@vger.kernel.org
Cc: linux-phy@lists.infradead.org
Cc: linux-spi@vger.kernel.org
Signed-off-by: default avatarRob Herring <robh@kernel.org>
Acked-by: default avatarMark Brown <broonie@kernel.org>
Acked-by: default avatarGuenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/20210713193514.690894-1-robh@kernel.org
parent e8917266
...@@ -39,17 +39,7 @@ properties: ...@@ -39,17 +39,7 @@ properties:
reg: reg:
maxItems: 1 maxItems: 1
patternProperties: adi,pwm-active-state:
"^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$":
description: | description: |
Integer array, represents the active state of the pwm outputs If set to 0 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 the pwm uses a logic low output for 100% duty cycle. If set to 1 the pwm
...@@ -61,6 +51,16 @@ patternProperties: ...@@ -61,6 +51,16 @@ patternProperties:
enum: [0, 1] enum: [0, 1]
default: 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: required:
- compatible - compatible
- reg - reg
......
...@@ -77,6 +77,34 @@ properties: ...@@ -77,6 +77,34 @@ properties:
Type-C spec states minimum CC pin debounce of 100 ms and maximum 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. 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: patternProperties:
"^pll[0|1]-refclk$": "^pll[0|1]-refclk$":
type: object type: object
...@@ -121,34 +149,6 @@ patternProperties: ...@@ -121,34 +149,6 @@ patternProperties:
- clocks - clocks
- "#clock-cells" - "#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]+$": "^serdes@[0-9a-f]+$":
type: object type: object
description: | description: |
......
...@@ -36,12 +36,12 @@ properties: ...@@ -36,12 +36,12 @@ properties:
switching frequency must be one of following corresponding value switching frequency must be one of following corresponding value
1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz 1.1MHz, 1.65MHz, 2.2MHz, 2.75MHz
patternProperties: ldortc:
"^ldo[1-4]$":
type: object type: object
$ref: regulator.yaml# $ref: regulator.yaml#
"^ldortc$": patternProperties:
"^ldo[1-4]$":
type: object type: object
$ref: regulator.yaml# $ref: regulator.yaml#
......
...@@ -83,7 +83,8 @@ properties: ...@@ -83,7 +83,8 @@ properties:
unevaluatedProperties: false unevaluatedProperties: false
"^vsnvs$": properties:
vsnvs:
type: object type: object
$ref: regulator.yaml# $ref: regulator.yaml#
description: description:
......
...@@ -79,22 +79,7 @@ properties: ...@@ -79,22 +79,7 @@ properties:
description: description:
The SPI controller acts as a slave, instead of a master. The SPI controller acts as a slave, instead of a master.
allOf: slave:
- if:
not:
required:
- spi-slave
then:
properties:
"#address-cells":
const: 1
else:
properties:
"#address-cells":
const: 0
patternProperties:
"^slave$":
type: object type: object
properties: properties:
...@@ -105,6 +90,7 @@ patternProperties: ...@@ -105,6 +90,7 @@ patternProperties:
required: required:
- compatible - compatible
patternProperties:
"^.*@[0-9a-f]+$": "^.*@[0-9a-f]+$":
type: object type: object
...@@ -180,6 +166,20 @@ patternProperties: ...@@ -180,6 +166,20 @@ patternProperties:
- compatible - compatible
- reg - reg
allOf:
- if:
not:
required:
- spi-slave
then:
properties:
"#address-cells":
const: 1
else:
properties:
"#address-cells":
const: 0
additionalProperties: true additionalProperties: true
examples: examples:
......
Markdown is supported
0%
or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment