diff options
| author | Rob Herring <robh@kernel.org> | 2020-06-10 15:49:12 -0600 |
|---|---|---|
| committer | Rob Herring <robh@kernel.org> | 2020-06-11 13:50:43 -0600 |
| commit | 086e9074f52f6f623e1d6d02edc3cb661bb04f4e (patch) | |
| tree | b08d5a9b2e39d3f86385d980d798c703de8d5473 /Documentation/devicetree/bindings/rng | |
| parent | 2dca74a40e1e7ff45079d85fc507769383039b9d (diff) | |
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: Rob Herring <robh@kernel.org>
Diffstat (limited to 'Documentation/devicetree/bindings/rng')
| -rw-r--r-- | Documentation/devicetree/bindings/rng/arm-cctrng.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/rng/arm-cctrng.yaml b/Documentation/devicetree/bindings/rng/arm-cctrng.yaml index ca6aad19b6ba..c471e4c10558 100644 --- a/Documentation/devicetree/bindings/rng/arm-cctrng.yaml +++ b/Documentation/devicetree/bindings/rng/arm-cctrng.yaml @@ -28,10 +28,8 @@ properties: description: Arm TrustZone CryptoCell TRNG engine has 4 ring oscillators. Sampling ratio values for these 4 ring oscillators. (from calibration) - allOf: - - $ref: /schemas/types.yaml#/definitions/uint32-array - - items: - maxItems: 4 + $ref: /schemas/types.yaml#/definitions/uint32-array + maxItems: 4 clocks: maxItems: 1 |