Skip to content

Commit 488833c

Browse files
Merge patch series "dt-bindings: riscv: cpus: switch to unevaluatedProperties: false"
Conor Dooley <[email protected]> says: From: Conor Dooley <[email protected]> Do the various bits needed to drop the additionalProperties: true that we currently have in riscv/cpu.yaml, to permit actually enforcing what people put in cpus nodes. * b4-shazam-merge: dt-bindings: riscv: cpus: switch to unevaluatedProperties: false dt-bindings: riscv: cpus: add a ref the common cpu schema Link: https://lore.kernel.org/r/20230615-creamer-emu-ade0fa0bdb68@spud Signed-off-by: Palmer Dabbelt <[email protected]>
2 parents 91afbaa + 1ffe6dd commit 488833c

File tree

1 file changed

+7
-1
lines changed
  • Documentation/devicetree/bindings/riscv

1 file changed

+7
-1
lines changed

Documentation/devicetree/bindings/riscv/cpus.yaml

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ description: |
2323
two cores, each of which has two hyperthreads, could be described as
2424
having four harts.
2525
26+
allOf:
27+
- $ref: /schemas/cpu.yaml#
28+
2629
properties:
2730
compatible:
2831
oneOf:
@@ -98,6 +101,9 @@ properties:
98101
$ref: /schemas/types.yaml#/definitions/string
99102
pattern: ^rv(?:64|32)imaf?d?q?c?b?k?j?p?v?h?(?:[hsxz](?:[a-z])+)?(?:_[hsxz](?:[a-z])+)*$
100103

104+
# RISC-V has multiple properties for cache op block sizes as the sizes
105+
# differ between individual CBO extensions
106+
cache-op-block-size: false
101107
# RISC-V requires 'timebase-frequency' in /cpus, so disallow it here
102108
timebase-frequency: false
103109

@@ -137,7 +143,7 @@ required:
137143
- riscv,isa
138144
- interrupt-controller
139145

140-
additionalProperties: true
146+
unevaluatedProperties: false
141147

142148
examples:
143149
- |

0 commit comments

Comments
 (0)