Skip to content

Commit

Permalink
dt-bindings: timer: arm,arch_timer: Allow dual compatible string
Browse files Browse the repository at this point in the history
Since the Armv7 and Armv8 architected timers are compatible, it is valid
to expose a devicetree node with compatible string "arm,armv8-timer"
followed by "arm,armv7-timer". For example a 32-bit guest running on a
64-bit machine may look for the v7 string even though the hardware is v8.
VMMs such as QEMU and kvmtool have been using this compatible string for
some time. Clean up the compatible list a little and add the dual
option.

Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Signed-off-by: Jean-Philippe Brucker <jean-philippe@linaro.org>
Acked-by: Marc Zyngier <maz@kernel.org>
Link: https://lore.kernel.org/r/20220922161149.371565-1-jean-philippe@linaro.org
Signed-off-by: Rob Herring <robh@kernel.org>
  • Loading branch information
Jean-Philippe Brucker authored and Rob Herring committed Sep 26, 2022
1 parent 2bd1228 commit 90c46d1
Showing 1 changed file with 5 additions and 6 deletions.
11 changes: 5 additions & 6 deletions Documentation/devicetree/bindings/timer/arm,arch_timer.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -22,16 +22,15 @@ properties:
compatible:
oneOf:
- items:
- enum:
- arm,cortex-a15-timer
- enum:
- arm,armv7-timer
- const: arm,cortex-a15-timer
- const: arm,armv7-timer
- items:
- enum:
- arm,armv7-timer
- items:
- enum:
- arm,armv8-timer
- items:
- const: arm,armv8-timer
- const: arm,armv7-timer

interrupts:
minItems: 1
Expand Down

0 comments on commit 90c46d1

Please sign in to comment.