The following commit has been merged into the timers/core branch of tip:
Commit-ID: 4abb38595b1b116bd1440c76c69c9f0416ec55a4
Gitweb: https://git.kernel.org/tip/4abb38595b1b116bd1440c76c69c9f0416ec55a4
Author: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
AuthorDate: Wed, 20 Jul 2022 09:53:34 +02:00
Committer: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
CommitterDate: Wed, 27 Jul 2022 17:01:52 +02:00
dt-bindings: timer: renesas,cmt: Fix R-Car Gen4 fall-out
Restore sort order (by family, followed by type).
Update the conditional sections specifying the number of interrupts.
Fixes: 525b296185b4b0ab ("dt-bindings: timer: renesas,cmt: Add r8a779f0 and generic Gen4 CMT support")
Signed-off-by: Geert Uytterhoeven <geert+renesas@xxxxxxxxx>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@xxxxxxxxxx>
Link: https://lore.kernel.org/r/2e3863ae32e17d49f41111580f195dd34e2b769d.1658303544.git.geert+renesas@xxxxxxxxx
Signed-off-by: Daniel Lezcano <daniel.lezcano@xxxxxxxxxx>
---
Documentation/devicetree/bindings/timer/renesas,cmt.yaml | 14 ++++---
1 file changed, 8 insertions(+), 6 deletions(-)
diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.yaml b/Documentation/devicetree/bindings/timer/renesas,cmt.yaml
index 433ddb4..bde6c9b 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.yaml
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.yaml
@@ -84,12 +84,6 @@ properties:
- items:
- enum:
- - renesas,r8a779a0-cmt0 # 32-bit CMT0 on R-Car V3U
- - renesas,r8a779f0-cmt0 # 32-bit CMT0 on R-Car S4-8
- - const: renesas,rcar-gen4-cmt0 # 32-bit CMT0 on R-Car Gen4
-
- - items:
- - enum:
- renesas,r8a774a1-cmt1 # 48-bit CMT on RZ/G2M
- renesas,r8a774b1-cmt1 # 48-bit CMT on RZ/G2N
- renesas,r8a774c0-cmt1 # 48-bit CMT on RZ/G2E
@@ -106,6 +100,12 @@ properties:
- items:
- enum:
+ - renesas,r8a779a0-cmt0 # 32-bit CMT0 on R-Car V3U
+ - renesas,r8a779f0-cmt0 # 32-bit CMT0 on R-Car S4-8
+ - const: renesas,rcar-gen4-cmt0 # 32-bit CMT0 on R-Car Gen4
+
+ - items:
+ - enum:
- renesas,r8a779a0-cmt1 # 48-bit CMT on R-Car V3U
- renesas,r8a779f0-cmt1 # 48-bit CMT on R-Car S4-8
- const: renesas,rcar-gen4-cmt1 # 48-bit CMT on R-Car Gen4
@@ -145,6 +145,7 @@ allOf:
enum:
- renesas,rcar-gen2-cmt0
- renesas,rcar-gen3-cmt0
+ - renesas,rcar-gen4-cmt0
then:
properties:
interrupts:
@@ -158,6 +159,7 @@ allOf:
enum:
- renesas,rcar-gen2-cmt1
- renesas,rcar-gen3-cmt1
+ - renesas,rcar-gen4-cmt1
then:
properties:
interrupts:
|