summaryrefslogtreecommitdiff
path: root/Documentation/devicetree/bindings/ipmi
diff options
context:
space:
mode:
authorRob Herring <robh@kernel.org>2020-06-11 00:49:12 +0300
committerRob Herring <robh@kernel.org>2020-06-11 22:50:43 +0300
commit086e9074f52f6f623e1d6d02edc3cb661bb04f4e (patch)
treeb08d5a9b2e39d3f86385d980d798c703de8d5473 /Documentation/devicetree/bindings/ipmi
parent2dca74a40e1e7ff45079d85fc507769383039b9d (diff)
downloadlinux-086e9074f52f6f623e1d6d02edc3cb661bb04f4e.tar.xz
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/ipmi')
-rw-r--r--Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml10
1 files changed, 4 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml b/Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml
index f0bb157e9417..58fa76ee6176 100644
--- a/Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml
+++ b/Documentation/devicetree/bindings/ipmi/ipmi-smic.yaml
@@ -31,9 +31,8 @@ properties:
reg-size:
description: The access width of the register in bytes. Defaults to 1.
- allOf:
- - $ref: /schemas/types.yaml#/definitions/uint32
- - enum: [1, 2, 4, 8]
+ $ref: /schemas/types.yaml#/definitions/uint32
+ enum: [1, 2, 4, 8]
reg-spacing:
$ref: /schemas/types.yaml#/definitions/uint32
@@ -43,9 +42,8 @@ properties:
description: |
The amount of bits to shift the register content to the right to get
the data into bit zero.
- allOf:
- - $ref: /schemas/types.yaml#/definitions/uint32
- - maximum: 56
+ $ref: /schemas/types.yaml#/definitions/uint32
+ maximum: 56
required:
- compatible