diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 11:56:43 -0700 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2020-06-12 11:56:43 -0700 |
| commit | 4071b856afc8a49ec41e98ff45151bb0800bc46d (patch) | |
| tree | dc4a8789a6da704b565213fca3d36adf2e55da97 /Documentation/devicetree/bindings/power/supply/sbs,sbs-battery.yaml | |
| parent | 7de26c41c19fc7b2e078d31fd039e1a017064b89 (diff) | |
| parent | 8440d4a75d90556cfb8fb3e244443f67381aafd6 (diff) | |
| download | linux-4071b856afc8a49ec41e98ff45151bb0800bc46d.tar.bz2 | |
Merge tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull Devicetree fixes from Rob Herring:
- Another round of whack-a-mole removing 'allOf', redundant cases of
'maxItems' and incorrect 'reg' sizes
- Fix support for yaml.h in non-standard paths
* tag 'devicetree-fixes-for-5.8-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
dt-bindings: Remove redundant 'maxItems'
dt-bindings: Fix more incorrect 'reg' property sizes in examples
dt-bindings: phy: qcom: Fix missing 'ranges' and example addresses
dt-bindings: Remove more cases of 'allOf' containing a '$ref'
scripts/dtc: use pkg-config to include <yaml.h> in non-standard path
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: |