diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-11 20:12:46 +0300 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-09-11 20:12:46 +0300 |
| commit | a1406e424253ba2121614377aaab274d403b08e0 (patch) | |
| tree | 7040174f2bb98e54f1575f8ef6c38641c2c251ff /Documentation/devicetree/bindings/spi/omap-spi.yaml | |
| parent | 2aae0a937ad169752b5710d4f210c1ae7a49d3cf (diff) | |
| parent | 094b147c766289baa0f370d124609c3ac2b5a420 (diff) | |
| download | linux-a1406e424253ba2121614377aaab274d403b08e0.tar.xz | |
Merge tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux
Pull devicetree fixes from Rob Herring:
- Disable fw_devlinks on x86 DT platforms to fix OLPC
- More replacing oneOf+const with enum on a few new schemas
- Drop unnecessary type references on Xilinx SPI binding schema
* tag 'devicetree-fixes-for-5.15-1' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux:
spi: dt-bindings: xilinx: Drop type reference on *-bits properties
dt-bindings: More use 'enum' instead of 'oneOf' plus 'const' entries
of: property: Disable fw_devlink DT support for X86
Diffstat (limited to 'Documentation/devicetree/bindings/spi/omap-spi.yaml')
| -rw-r--r-- | Documentation/devicetree/bindings/spi/omap-spi.yaml | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/Documentation/devicetree/bindings/spi/omap-spi.yaml b/Documentation/devicetree/bindings/spi/omap-spi.yaml index e55538186cf6..9952199cae11 100644 --- a/Documentation/devicetree/bindings/spi/omap-spi.yaml +++ b/Documentation/devicetree/bindings/spi/omap-spi.yaml @@ -84,9 +84,9 @@ unevaluatedProperties: false if: properties: compatible: - oneOf: - - const: ti,omap2-mcspi - - const: ti,omap4-mcspi + enum: + - ti,omap2-mcspi + - ti,omap4-mcspi then: properties: |