Commit 086e9074 authored by Rob Herring's avatar Rob Herring

dt-bindings: Remove more cases of 'allOf' containing a '$ref'

Another round of 'allOf' removals that came in this cycle.

json-schema versions draft7 and earlier have a weird behavior in that
any keywords combined with a '$ref' are ignored (silently). The correct
form was to put a '$ref' under an 'allOf'. This behavior is now changed
in the 2019-09 json-schema spec and '$ref' can be mixed with other
keywords. The json-schema library doesn't yet support this, but the
tooling now does a fixup for this and either way works.

This has been a constant source of review comments, so let's change this
treewide so everyone copies the simpler syntax.
Signed-off-by: default avatarRob Herring <robh@kernel.org>
parent 2dca74a4
...@@ -85,9 +85,8 @@ properties: ...@@ -85,9 +85,8 @@ properties:
CPU power good signal from external PMIC to PMC is enabled. CPU power good signal from external PMIC to PMC is enabled.
nvidia,suspend-mode: nvidia,suspend-mode:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2]
- enum: [0, 1, 2]
description: description:
The suspend mode that the platform should use. The suspend mode that the platform should use.
Mode 0 is for LP0, CPU + Core voltage off and DRAM in self-refresh Mode 0 is for LP0, CPU + Core voltage off and DRAM in self-refresh
......
...@@ -40,27 +40,24 @@ properties: ...@@ -40,27 +40,24 @@ properties:
calxeda,led-order: calxeda,led-order:
description: Maps port numbers to offsets within the SGPIO bitstream. description: Maps port numbers to offsets within the SGPIO bitstream.
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 8 maxItems: 8
calxeda,port-phys: calxeda,port-phys:
description: | description: |
phandle-combophy and lane assignment, which maps each SATA port to a phandle-combophy and lane assignment, which maps each SATA port to a
combophy and a lane within that combophy combophy and a lane within that combophy
allOf: $ref: /schemas/types.yaml#/definitions/phandle-array
- $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1
- minItems: 1
maxItems: 8 maxItems: 8
calxeda,tx-atten: calxeda,tx-atten:
description: | description: |
Contains TX attenuation override codes, one per port. Contains TX attenuation override codes, one per port.
The upper 24 bits of each entry are always 0 and thus ignored. The upper 24 bits of each entry are always 0 and thus ignored.
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 8 maxItems: 8
calxeda,sgpio-gpio: calxeda,sgpio-gpio:
......
...@@ -63,10 +63,9 @@ patternProperties: ...@@ -63,10 +63,9 @@ patternProperties:
snps,nr-gpios: snps,nr-gpios:
description: The number of GPIO pins exported by the port. description: The number of GPIO pins exported by the port.
$ref: /schemas/types.yaml#/definitions/uint32
default: 32 default: 32
allOf: minimum: 1
- $ref: /schemas/types.yaml#/definitions/uint32
- minimum: 1
maximum: 32 maximum: 32
interrupts: interrupts:
......
...@@ -67,8 +67,7 @@ properties: ...@@ -67,8 +67,7 @@ properties:
1 - direct_sync 1 - direct_sync
2 - scaled_sync 2 - scaled_sync
3 - pulse_sync 3 - pulse_sync
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
minimum: 0 minimum: 0
maximum: 3 maximum: 3
......
...@@ -25,9 +25,8 @@ properties: ...@@ -25,9 +25,8 @@ properties:
amstaos,cover-comp-gain: amstaos,cover-comp-gain:
description: Multiplier for gain compensation description: Multiplier for gain compensation
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [1, 16]
- enum: [1, 16]
required: required:
- compatible - compatible
......
...@@ -40,9 +40,8 @@ properties: ...@@ -40,9 +40,8 @@ properties:
posed on channels 6 and 7 by Hall-effect sensing. posed on channels 6 and 7 by Hall-effect sensing.
azoteq,suspend-mode: azoteq,suspend-mode:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 0 default: 0
description: | description: |
Specifies the power mode during suspend as follows: Specifies the power mode during suspend as follows:
...@@ -56,9 +55,8 @@ properties: ...@@ -56,9 +55,8 @@ properties:
description: Divides the device's core clock by a factor of 4. description: Divides the device's core clock by a factor of 4.
azoteq,ulp-update: azoteq,ulp-update:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 7 maximum: 7
default: 3 default: 3
description: Specifies the ultra-low-power mode update rate. description: Specifies the ultra-low-power mode update rate.
...@@ -70,33 +68,29 @@ properties: ...@@ -70,33 +68,29 @@ properties:
reseed events. reseed events.
azoteq,filt-str-lp-lta: azoteq,filt-str-lp-lta:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 0 default: 0
description: description:
Specifies the long-term average filter strength during low-power mode. Specifies the long-term average filter strength during low-power mode.
azoteq,filt-str-lp-cnt: azoteq,filt-str-lp-cnt:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 0 default: 0
description: description:
Specifies the raw count filter strength during low-power mode. Specifies the raw count filter strength during low-power mode.
azoteq,filt-str-np-lta: azoteq,filt-str-np-lta:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 0 default: 0
description: description:
Specifies the long-term average filter strength during normal-power mode. Specifies the long-term average filter strength during normal-power mode.
azoteq,filt-str-np-cnt: azoteq,filt-str-np-cnt:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 0 default: 0
description: description:
Specifies the raw count filter strength during normal-power mode. Specifies the raw count filter strength during normal-power mode.
...@@ -156,9 +150,8 @@ properties: ...@@ -156,9 +150,8 @@ properties:
description: Disables all raw count filtering. description: Disables all raw count filtering.
azoteq,gpio3-select: azoteq,gpio3-select:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 7 maximum: 7
default: 0 default: 0
description: description:
...@@ -172,9 +165,8 @@ properties: ...@@ -172,9 +165,8 @@ properties:
in either direction. in either direction.
azoteq,tx-freq: azoteq,tx-freq:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 0 default: 0
description: | description: |
Specifies the inductive sensing excitation frequency as follows (paren- Specifies the inductive sensing excitation frequency as follows (paren-
...@@ -189,9 +181,8 @@ properties: ...@@ -189,9 +181,8 @@ properties:
description: Increases the global capacitance adder from 0.5 pF to 1.5 pF. description: Increases the global capacitance adder from 0.5 pF to 1.5 pF.
azoteq,reseed-select: azoteq,reseed-select:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 0 default: 0
description: | description: |
Specifies the event(s) that prompt the device to reseed (i.e. reset the Specifies the event(s) that prompt the device to reseed (i.e. reset the
...@@ -208,9 +199,8 @@ properties: ...@@ -208,9 +199,8 @@ properties:
channels. channels.
azoteq,filt-str-slider: azoteq,filt-str-slider:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 1 default: 1
description: Specifies the slider coordinate filter strength. description: Specifies the slider coordinate filter strength.
...@@ -246,9 +236,8 @@ patternProperties: ...@@ -246,9 +236,8 @@ patternProperties:
description: Specifies that the channel participates in slider 1. description: Specifies that the channel participates in slider 1.
azoteq,rx-enable: azoteq,rx-enable:
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 8 maxItems: 8
items: items:
minimum: 0 minimum: 0
...@@ -259,9 +248,8 @@ patternProperties: ...@@ -259,9 +248,8 @@ patternProperties:
for channel 0). for channel 0).
azoteq,tx-enable: azoteq,tx-enable:
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 8 maxItems: 8
items: items:
minimum: 0 minimum: 0
...@@ -279,9 +267,8 @@ patternProperties: ...@@ -279,9 +267,8 @@ patternProperties:
description: Floats any inactive CRX pins instead of grounding them. description: Floats any inactive CRX pins instead of grounding them.
azoteq,local-cap-size: azoteq,local-cap-size:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2]
- enum: [0, 1, 2]
default: 0 default: 0
description: | description: |
Specifies the capacitance to be added to the channel as follows: Specifies the capacitance to be added to the channel as follows:
...@@ -296,9 +283,8 @@ patternProperties: ...@@ -296,9 +283,8 @@ patternProperties:
deep-touch events relative to their respective thresholds. deep-touch events relative to their respective thresholds.
azoteq,proj-bias: azoteq,proj-bias:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 2 default: 2
description: | description: |
Specifies the bias current applied during projected-capacitance Specifies the bias current applied during projected-capacitance
...@@ -309,9 +295,8 @@ patternProperties: ...@@ -309,9 +295,8 @@ patternProperties:
3: 20 uA 3: 20 uA
azoteq,sense-mode: azoteq,sense-mode:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 9, 14, 15]
- enum: [0, 1, 9, 14, 15]
default: 0 default: 0
description: | description: |
Specifies the channel's sensing mode as follows: Specifies the channel's sensing mode as follows:
...@@ -322,9 +307,8 @@ patternProperties: ...@@ -322,9 +307,8 @@ patternProperties:
15: Temperature 15: Temperature
azoteq,sense-freq: azoteq,sense-freq:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 1 default: 1
description: | description: |
Specifies the channel's sensing frequency as follows (parenthesized Specifies the channel's sensing frequency as follows (parenthesized
...@@ -339,9 +323,8 @@ patternProperties: ...@@ -339,9 +323,8 @@ patternProperties:
description: Enables the static front-end for the channel. description: Enables the static front-end for the channel.
azoteq,ati-mode: azoteq,ati-mode:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [0, 1, 2, 3]
- enum: [0, 1, 2, 3]
default: 3 default: 3
description: | description: |
Specifies the channel's ATI mode as follows: Specifies the channel's ATI mode as follows:
...@@ -351,25 +334,22 @@ patternProperties: ...@@ -351,25 +334,22 @@ patternProperties:
3: Full 3: Full
azoteq,ati-base: azoteq,ati-base:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [75, 100, 150, 200]
- enum: [75, 100, 150, 200]
default: 100 default: 100
description: Specifies the channel's ATI base. description: Specifies the channel's ATI base.
azoteq,ati-target: azoteq,ati-target:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 multipleOf: 32
- multipleOf: 32
minimum: 0 minimum: 0
maximum: 2016 maximum: 2016
default: 512 default: 512
description: Specifies the channel's ATI target. description: Specifies the channel's ATI target.
azoteq,assoc-select: azoteq,assoc-select:
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 8 maxItems: 8
items: items:
minimum: 0 minimum: 0
...@@ -379,9 +359,8 @@ patternProperties: ...@@ -379,9 +359,8 @@ patternProperties:
reference channel. By default, no channels are selected. reference channel. By default, no channels are selected.
azoteq,assoc-weight: azoteq,assoc-weight:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 255 maximum: 255
default: 0 default: 0
description: description:
...@@ -411,9 +390,8 @@ patternProperties: ...@@ -411,9 +390,8 @@ patternProperties:
properties: properties:
azoteq,thresh: azoteq,thresh:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 255 maximum: 255
default: 10 default: 10
description: Specifies the threshold for the event. description: Specifies the threshold for the event.
...@@ -430,17 +408,15 @@ patternProperties: ...@@ -430,17 +408,15 @@ patternProperties:
properties: properties:
azoteq,thresh: azoteq,thresh:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 255 maximum: 255
default: 8 default: 8
description: Specifies the threshold for the event. description: Specifies the threshold for the event.
azoteq,hyst: azoteq,hyst:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 15 maximum: 15
default: 4 default: 4
description: Specifies the hysteresis for the event. description: Specifies the hysteresis for the event.
...@@ -457,17 +433,15 @@ patternProperties: ...@@ -457,17 +433,15 @@ patternProperties:
properties: properties:
azoteq,thresh: azoteq,thresh:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 255 maximum: 255
default: 26 default: 26
description: Specifies the threshold for the event. description: Specifies the threshold for the event.
azoteq,hyst: azoteq,hyst:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 0
- minimum: 0
maximum: 15 maximum: 15
default: 0 default: 0
description: Specifies the hysteresis for the event. description: Specifies the hysteresis for the event.
......
...@@ -25,18 +25,16 @@ properties: ...@@ -25,18 +25,16 @@ properties:
description: description:
u32 value of the base of parent HyperTransport vector allocated u32 value of the base of parent HyperTransport vector allocated
to PCH MSI. to PCH MSI.
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" minimum: 0
- minimum: 0
maximum: 255 maximum: 255
loongson,msi-num-vecs: loongson,msi-num-vecs:
description: description:
u32 value of the number of parent HyperTransport vectors allocated u32 value of the number of parent HyperTransport vectors allocated
to PCH MSI. to PCH MSI.
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" minimum: 1
- minimum: 1
maximum: 256 maximum: 256
msi-controller: true msi-controller: true
......
...@@ -25,9 +25,8 @@ properties: ...@@ -25,9 +25,8 @@ properties:
description: description:
u32 value of the base of parent HyperTransport vector allocated u32 value of the base of parent HyperTransport vector allocated
to PCH PIC. to PCH PIC.
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" minimum: 0
- minimum: 0
maximum: 192 maximum: 192
interrupt-controller: true interrupt-controller: true
......
...@@ -31,9 +31,8 @@ properties: ...@@ -31,9 +31,8 @@ properties:
reg-size: reg-size:
description: The access width of the register in bytes. Defaults to 1. description: The access width of the register in bytes. Defaults to 1.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [1, 2, 4, 8]
- enum: [1, 2, 4, 8]
reg-spacing: reg-spacing:
$ref: /schemas/types.yaml#/definitions/uint32 $ref: /schemas/types.yaml#/definitions/uint32
...@@ -43,9 +42,8 @@ properties: ...@@ -43,9 +42,8 @@ properties:
description: | description: |
The amount of bits to shift the register content to the right to get The amount of bits to shift the register content to the right to get
the data into bit zero. the data into bit zero.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 maximum: 56
- maximum: 56
required: required:
- compatible - compatible
......
...@@ -57,8 +57,7 @@ properties: ...@@ -57,8 +57,7 @@ properties:
description: | description: |
mA; per-string current limit. mA; per-string current limit.
This property is supported only for WLED3. This property is supported only for WLED3.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
default: 20 default: 20
minimum: 0 minimum: 0
maximum: 25 maximum: 25
...@@ -74,38 +73,33 @@ properties: ...@@ -74,38 +73,33 @@ properties:
qcom,current-boost-limit: qcom,current-boost-limit:
description: | description: |
mA; boost current limit. mA; boost current limit.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
qcom,switching-freq: qcom,switching-freq:
description: | description: |
kHz; switching frequency. kHz; switching frequency.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, 4800, 9600 ]
- enum: [ 600, 640, 685, 738, 800, 872, 960, 1066, 1200, 1371, 1600, 1920, 2400, 3200, 4800, 9600 ]
qcom,ovp: qcom,ovp:
description: | description: |
V; Over-voltage protection limit. V; Over-voltage protection limit.
This property is supported only for WLED3. This property is supported only for WLED3.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 27, 29, 32, 35 ]
- enum: [ 27, 29, 32, 35 ] default: 29
- default: 29
qcom,ovp-millivolt: qcom,ovp-millivolt:
description: | description: |
Over-voltage protection limit. This property is for WLED4 only. Over-voltage protection limit. This property is for WLED4 only.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 18100, 19600, 29600, 31100 ]
- enum: [ 18100, 19600, 29600, 31100 ] default: 29600
- default: 29600
qcom,num-strings: qcom,num-strings:
description: | description: |
number of led strings attached. number of led strings attached.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
qcom,enabled-strings: qcom,enabled-strings:
description: | description: |
...@@ -113,8 +107,7 @@ properties: ...@@ -113,8 +107,7 @@ properties:
string of leds are operated individually. Specify the string of leds are operated individually. Specify the
list of strings used by the device. Any combination of list of strings used by the device. Any combination of
led strings can be used. led strings can be used.
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array
minItems: 1 minItems: 1
maxItems: 4 maxItems: 4
...@@ -150,10 +143,9 @@ properties: ...@@ -150,10 +143,9 @@ properties:
0 - Modulator A 0 - Modulator A
1 - Modulator B 1 - Modulator B
This property is applicable only to WLED5 peripheral. This property is applicable only to WLED5 peripheral.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 0, 1 ]
- enum: [ 0, 1 ] default: 0
- default: 0
qcom,cabc-sel: qcom,cabc-sel:
description: | description: |
...@@ -164,9 +156,8 @@ properties: ...@@ -164,9 +156,8 @@ properties:
2 - CABC 2 2 - CABC 2
3 - External signal (e.g. LPG) is used for dimming 3 - External signal (e.g. LPG) is used for dimming
This property is applicable only to WLED5 peripheral. This property is applicable only to WLED5 peripheral.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 0, 1, 2, 3 ]
- enum: [ 0, 1, 2, 3 ]
allOf: allOf:
- if: - if:
......
...@@ -32,8 +32,7 @@ properties: ...@@ -32,8 +32,7 @@ properties:
patternProperties: patternProperties:
"^led@[0-2]$": "^led@[0-2]$":
type: object type: object
allOf: $ref: common.yaml#
- $ref: common.yaml#
properties: properties:
reg: reg:
......
...@@ -33,8 +33,7 @@ properties: ...@@ -33,8 +33,7 @@ properties:
led: led:
type: object type: object
allOf: $ref: common.yaml#
- $ref: common.yaml#
required: required:
- compatible - compatible
......
...@@ -79,8 +79,7 @@ properties: ...@@ -79,8 +79,7 @@ properties:
- const: 4 - const: 4
link-frequencies: link-frequencies:
allOf: $ref: /schemas/types.yaml#/definitions/uint64-array
- $ref: /schemas/types.yaml#/definitions/uint64-array
description: description:
Allowed data bus frequencies. 360000000, 180000000 Hz or both Allowed data bus frequencies. 360000000, 180000000 Hz or both
are supported by the driver. are supported by the driver.
......
...@@ -45,9 +45,8 @@ patternProperties: ...@@ -45,9 +45,8 @@ patternProperties:
maxItems: 255 maxItems: 255
ingenic,nemc-bus-width: ingenic,nemc-bus-width:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [8, 16]
- enum: [8, 16]
description: Specifies the bus width in bits. description: Specifies the bus width in bits.
ingenic,nemc-tAS: ingenic,nemc-tAS:
......
...@@ -145,8 +145,7 @@ patternProperties: ...@@ -145,8 +145,7 @@ patternProperties:
"^cpts@[0-9a-f]+": "^cpts@[0-9a-f]+":
type: object type: object
allOf: $ref: "ti,k3-am654-cpts.yaml#"
- $ref: "ti,k3-am654-cpts.yaml#"
description: description:
CPSW Common Platform Time Sync (CPTS) module. CPSW Common Platform Time Sync (CPTS) module.
......
...@@ -74,15 +74,13 @@ properties: ...@@ -74,15 +74,13 @@ properties:
- const: cpts - const: cpts
ti,cpts-ext-ts-inputs: ti,cpts-ext-ts-inputs:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
maximum: 8 maximum: 8
description: description:
Number of hardware timestamp push inputs (HWx_TS_PUSH) Number of hardware timestamp push inputs (HWx_TS_PUSH)
ti,cpts-periodic-outputs: ti,cpts-periodic-outputs:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
maximum: 8 maximum: 8
description: description:
Number of timestamp Generator function outputs (TS_GENFx) Number of timestamp Generator function outputs (TS_GENFx)
......
...@@ -15,8 +15,7 @@ allOf: ...@@ -15,8 +15,7 @@ allOf:
properties: properties:
cdns,max-outbound-regions: cdns,max-outbound-regions:
description: maximum number of outbound regions description: maximum number of outbound regions
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
minimum: 1 minimum: 1
maximum: 32 maximum: 32
default: 32 default: 32
......
...@@ -16,8 +16,7 @@ allOf: ...@@ -16,8 +16,7 @@ allOf:
properties: properties:
cdns,max-outbound-regions: cdns,max-outbound-regions:
description: maximum number of outbound regions description: maximum number of outbound regions
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
minimum: 1 minimum: 1
maximum: 32 maximum: 32
default: 32 default: 32
......
...@@ -29,9 +29,8 @@ properties: ...@@ -29,9 +29,8 @@ properties:
phydev: phydev:
description: device ID for programming the ComboPHY. description: device ID for programming the ComboPHY.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 maximum: 31
- maximum: 31
required: required:
- compatible - compatible
......
...@@ -52,9 +52,8 @@ properties: ...@@ -52,9 +52,8 @@ properties:
description: | description: |
Enable/disable spread spectrum clock (ssc). 0 or the property doesn't Enable/disable spread spectrum clock (ssc). 0 or the property doesn't
exist means disabling the ssc. The actual value will be -<value> ppm. exist means disabling the ssc. The actual value will be -<value> ppm.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 0, 4003, 4492, 4980 ]
- enum: [ 0, 4003, 4492, 4980 ]
required: required:
- compatible - compatible
......
...@@ -27,10 +27,8 @@ properties: ...@@ -27,10 +27,8 @@ properties:
of this binary blob is kept secret by CellWise. The only way to obtain of this binary blob is kept secret by CellWise. The only way to obtain
it is to mail two batteries to a test facility of CellWise and receive it is to mail two batteries to a test facility of CellWise and receive
back a test report with the binary blob. back a test report with the binary blob.
allOf: $ref: /schemas/types.yaml#definitions/uint8-array
- $ref: /schemas/types.yaml#definitions/uint8-array minItems: 64
items:
- minItems: 64
maxItems: 64 maxItems: 64
cellwise,monitor-interval-ms: cellwise,monitor-interval-ms:
...@@ -41,9 +39,8 @@ properties: ...@@ -41,9 +39,8 @@ properties:
power-supplies: power-supplies:
description: description:
Specifies supplies used for charging the battery connected to this gauge Specifies supplies used for charging the battery connected to this gauge
allOf: $ref: /schemas/types.yaml#/definitions/phandle-array
- $ref: /schemas/types.yaml#/definitions/phandle-array minItems: 1
- minItems: 1
maxItems: 8 # Should be enough maxItems: 8 # Should be enough
monitored-battery: monitored-battery:
......
...@@ -32,16 +32,14 @@ properties: ...@@ -32,16 +32,14 @@ properties:
description: description:
The number of times to retry I2C transactions on I2C IO failure. The number of times to retry I2C transactions on I2C IO failure.
default: 0 default: 0
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
sbs,poll-retry-count: sbs,poll-retry-count:
description: description:
The number of times to try looking for new status after an external The number of times to try looking for new status after an external
change notification. change notification.
default: 0 default: 0
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
sbs,battery-detect-gpios: sbs,battery-detect-gpios:
description: description:
......
...@@ -21,8 +21,7 @@ properties: ...@@ -21,8 +21,7 @@ properties:
regulators: regulators:
type: object type: object
allOf: $ref: regulator.yaml#
- $ref: regulator.yaml#
description: | description: |
list of regulators provided by this controller, must be named list of regulators provided by this controller, must be named
after their hardware counterparts LDO[1-15], BUCK and BUCKBOOST after their hardware counterparts LDO[1-15], BUCK and BUCKBOOST
...@@ -30,13 +29,11 @@ properties: ...@@ -30,13 +29,11 @@ properties:
patternProperties: patternProperties:
"^LDO([1-9]|1[0-5])$": "^LDO([1-9]|1[0-5])$":
type: object type: object
allOf: $ref: regulator.yaml#
- $ref: regulator.yaml#
"^BUCK|BUCKBOOST$": "^BUCK|BUCKBOOST$":
type: object type: object
allOf: $ref: regulator.yaml#
- $ref: regulator.yaml#
additionalProperties: false additionalProperties: false
......
...@@ -29,8 +29,7 @@ description: | ...@@ -29,8 +29,7 @@ description: |
patternProperties: patternProperties:
"^LDO[1-6]$": "^LDO[1-6]$":
type: object type: object
allOf: $ref: regulator.yaml#
- $ref: regulator.yaml#
description: description:
Properties for single LDO regulator. Properties for single LDO regulator.
...@@ -44,8 +43,7 @@ patternProperties: ...@@ -44,8 +43,7 @@ patternProperties:
"^BUCK[1-6]$": "^BUCK[1-6]$":
type: object type: object
allOf: $ref: regulator.yaml#
- $ref: regulator.yaml#
description: description:
Properties for single BUCK regulator. Properties for single BUCK regulator.
...@@ -56,27 +54,24 @@ patternProperties: ...@@ -56,27 +54,24 @@ patternProperties:
should be "buck1", ..., "buck6" should be "buck1", ..., "buck6"
rohm,dvs-run-voltage: rohm,dvs-run-voltage:
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" minimum: 0
- minimum: 0
maximum: 1300000 maximum: 1300000
description: description:
PMIC default "RUN" state voltage in uV. See below table for PMIC default "RUN" state voltage in uV. See below table for
bucks which support this. 0 means disabled. bucks which support this. 0 means disabled.
rohm,dvs-idle-voltage: rohm,dvs-idle-voltage:
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" minimum: 0
- minimum: 0
maximum: 1300000 maximum: 1300000
description: description:
PMIC default "IDLE" state voltage in uV. See below table for PMIC default "IDLE" state voltage in uV. See below table for
bucks which support this. 0 means disabled. bucks which support this. 0 means disabled.
rohm,dvs-suspend-voltage: rohm,dvs-suspend-voltage:
allOf: $ref: "/schemas/types.yaml#/definitions/uint32"
- $ref: "/schemas/types.yaml#/definitions/uint32" minimum: 0
- minimum: 0
maximum: 1300000 maximum: 1300000
description: description:
PMIC default "SUSPEND" state voltage in uV. See below table for PMIC default "SUSPEND" state voltage in uV. See below table for
......
...@@ -28,9 +28,7 @@ properties: ...@@ -28,9 +28,7 @@ properties:
description: description:
Arm TrustZone CryptoCell TRNG engine has 4 ring oscillators. Arm TrustZone CryptoCell TRNG engine has 4 ring oscillators.
Sampling ratio values for these 4 ring oscillators. (from calibration) Sampling ratio values for these 4 ring oscillators. (from calibration)
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array
- items:
maxItems: 4 maxItems: 4
clocks: clocks:
......
...@@ -33,9 +33,8 @@ properties: ...@@ -33,9 +33,8 @@ properties:
description: | description: |
The size (in bytes) of the IO accesses that should be performed The size (in bytes) of the IO accesses that should be performed
on the device. on the device.
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [ 1, 4 ]
- enum: [ 1, 4 ]
clocks: clocks:
minItems: 2 minItems: 2
......
...@@ -100,8 +100,7 @@ patternProperties: ...@@ -100,8 +100,7 @@ patternProperties:
supports up to 50MHz, up to four chip selects, programmable supports up to 50MHz, up to four chip selects, programmable
data path from 4 bits to 32 bits and numerous protocol data path from 4 bits to 32 bits and numerous protocol
variants. variants.
allOf: $ref: /spi/spi-controller.yaml#
- $ref: /spi/spi-controller.yaml#
properties: properties:
compatible: compatible:
...@@ -126,8 +125,7 @@ patternProperties: ...@@ -126,8 +125,7 @@ patternProperties:
"i2c@[0-9a-f]+$": "i2c@[0-9a-f]+$":
type: object type: object
description: GENI serial engine based I2C controller. description: GENI serial engine based I2C controller.
allOf: $ref: /schemas/i2c/i2c-controller.yaml#
- $ref: /schemas/i2c/i2c-controller.yaml#
properties: properties:
compatible: compatible:
...@@ -156,8 +154,7 @@ patternProperties: ...@@ -156,8 +154,7 @@ patternProperties:
"serial@[0-9a-f]+$": "serial@[0-9a-f]+$":
type: object type: object
description: GENI Serial Engine based UART Controller. description: GENI Serial Engine based UART Controller.
allOf: $ref: /schemas/serial.yaml#
- $ref: /schemas/serial.yaml#
properties: properties:
compatible: compatible:
......
...@@ -45,22 +45,19 @@ properties: ...@@ -45,22 +45,19 @@ properties:
- const: ctx3_tx - const: ctx3_tx
firmware-name: firmware-name:
allOf: $ref: /schemas/types.yaml#/definitions/string
- $ref: /schemas/types.yaml#/definitions/string const: imx/easrc/easrc-imx8mn.bin
- const: imx/easrc/easrc-imx8mn.bin
description: The coefficient table for the filters description: The coefficient table for the filters
fsl,asrc-rate: fsl,asrc-rate:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 minimum: 8000
- minimum: 8000 maximum: 192000
- maximum: 192000
description: Defines a mutual sample rate used by DPCM Back Ends description: Defines a mutual sample rate used by DPCM Back Ends
fsl,asrc-format: fsl,asrc-format:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 enum: [2, 6, 10, 32, 36]
- enum: [2, 6, 10, 32, 36]
default: 2 default: 2
description: description:
Defines a mutual sample format used by DPCM Back Ends Defines a mutual sample format used by DPCM Back Ends
......
...@@ -13,15 +13,13 @@ definitions: ...@@ -13,15 +13,13 @@ definitions:
frame-master: frame-master:
description: Indicates dai-link frame master. description: Indicates dai-link frame master.
allOf: $ref: /schemas/types.yaml#/definitions/phandle-array
- $ref: /schemas/types.yaml#/definitions/phandle-array maxItems: 1
- maxItems: 1
bitclock-master: bitclock-master:
description: Indicates dai-link bit clock master description: Indicates dai-link bit clock master
allOf: $ref: /schemas/types.yaml#/definitions/phandle-array
- $ref: /schemas/types.yaml#/definitions/phandle-array maxItems: 1
- maxItems: 1
frame-inversion: frame-inversion:
description: dai-link uses frame clock inversion description: dai-link uses frame clock inversion
......
...@@ -76,9 +76,8 @@ properties: ...@@ -76,9 +76,8 @@ properties:
PDMIN3 - PDMCLK latching edge used for channel 5 and 6 data PDMIN3 - PDMCLK latching edge used for channel 5 and 6 data
PDMIN4 - PDMCLK latching edge used for channel 7 and 8 data PDMIN4 - PDMCLK latching edge used for channel 7 and 8 data
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 4 maxItems: 4
items: items:
maximum: 1 maximum: 1
...@@ -102,9 +101,8 @@ properties: ...@@ -102,9 +101,8 @@ properties:
7 - GPIX is configured as a PDM data input for channel 7 and channel 7 - GPIX is configured as a PDM data input for channel 7 and channel
(PDMDIN4) (PDMDIN4)
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array minItems: 1
- minItems: 1
maxItems: 4 maxItems: 4
items: items:
maximum: 7 maximum: 7
......
...@@ -28,9 +28,8 @@ properties: ...@@ -28,9 +28,8 @@ properties:
const: 0 const: 0
socionext,tmod-calibration: socionext,tmod-calibration:
allOf: $ref: /schemas/types.yaml#/definitions/uint32-array
- $ref: /schemas/types.yaml#/definitions/uint32-array maxItems: 2
- maxItems: 2
description: description:
A pair of calibrated values referred from PVT, in case that the values A pair of calibrated values referred from PVT, in case that the values
aren't set on SoC, like a reference board. aren't set on SoC, like a reference board.
......
...@@ -52,21 +52,18 @@ properties: ...@@ -52,21 +52,18 @@ properties:
vhub-vendor-id: vhub-vendor-id:
description: vhub Vendor ID description: vhub Vendor ID
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 maximum: 65535
- maximum: 65535
vhub-product-id: vhub-product-id:
description: vhub Product ID description: vhub Product ID
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 maximum: 65535
- maximum: 65535
vhub-device-revision: vhub-device-revision:
description: vhub Device Revision in binary-coded decimal description: vhub Device Revision in binary-coded decimal
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32 maximum: 65535
- maximum: 65535
vhub-strings: vhub-strings:
type: object type: object
...@@ -90,18 +87,15 @@ properties: ...@@ -90,18 +87,15 @@ properties:
manufacturer: manufacturer:
description: vhub manufacturer description: vhub manufacturer
allOf: $ref: /schemas/types.yaml#/definitions/string
- $ref: /schemas/types.yaml#/definitions/string
product: product:
description: vhub product name description: vhub product name
allOf: $ref: /schemas/types.yaml#/definitions/string
- $ref: /schemas/types.yaml#/definitions/string
serial-number: serial-number:
description: vhub device serial number description: vhub device serial number
allOf: $ref: /schemas/types.yaml#/definitions/string
- $ref: /schemas/types.yaml#/definitions/string
required: required:
- compatible - compatible
......
...@@ -17,8 +17,7 @@ properties: ...@@ -17,8 +17,7 @@ properties:
enum: enum:
- arm,smc-wdt - arm,smc-wdt
arm,smc-id: arm,smc-id:
allOf: $ref: /schemas/types.yaml#/definitions/uint32
- $ref: /schemas/types.yaml#/definitions/uint32
description: | description: |
The ATF smc function id used by the firmware. The ATF smc function id used by the firmware.
Defaults to 0x82003D06 if unset. Defaults to 0x82003D06 if unset.
......
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