From: Jean-Philippe Brucker Date: Thu, 22 Sep 2022 16:11:50 +0000 (+0100) Subject: dt-bindings: timer: arm,arch_timer: Allow dual compatible string X-Git-Tag: v6.1-rc5~228^2~15 X-Git-Url: http://review.tizen.org/git/?a=commitdiff_plain;h=90c46d12ba524257ed11404e336211c71d523366;p=platform%2Fkernel%2Flinux-starfive.git dt-bindings: timer: arm,arch_timer: Allow dual compatible string 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 Signed-off-by: Jean-Philippe Brucker Acked-by: Marc Zyngier Link: https://lore.kernel.org/r/20220922161149.371565-1-jean-philippe@linaro.org Signed-off-by: Rob Herring --- diff --git a/Documentation/devicetree/bindings/timer/arm,arch_timer.yaml b/Documentation/devicetree/bindings/timer/arm,arch_timer.yaml index df8ce87..c5fc3b6 100644 --- a/Documentation/devicetree/bindings/timer/arm,arch_timer.yaml +++ b/Documentation/devicetree/bindings/timer/arm,arch_timer.yaml @@ -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