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/power/supply/sbs,sbs-battery.yaml | |
| parent | Merge tag 'mailbox-v5.8' of git://git.linaro.org/landing-teams/working/fujitsu/integration (diff) | |
| download | wireguard-linux-086e9074f52f6f623e1d6d02edc3cb661bb04f4e.tar.xz wireguard-linux-086e9074f52f6f623e1d6d02edc3cb661bb04f4e.zip | |
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/power/supply/sbs,sbs-battery.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml | 6 |
1 files changed, 2 insertions, 4 deletions
diff --git a/Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml b/Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml index 205bc826bd20..a90b3601e695 100644 --- a/Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml +++ b/Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml @@ -32,16 +32,14 @@ properties: description: The number of times to retry I2C transactions on I2C IO failure. default: 0 - allOf: - - $ref: /schemas/types.yaml#/definitions/uint32 + $ref: /schemas/types.yaml#/definitions/uint32 sbs,poll-retry-count: description: The number of times to try looking for new status after an external change notification. default: 0 - allOf: - - $ref: /schemas/types.yaml#/definitions/uint32 + $ref: /schemas/types.yaml#/definitions/uint32 sbs,battery-detect-gpios: description: |