2022-07-20 08:21:05

by Geert Uytterhoeven

[permalink] [raw]

Subject: [PATCH] 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 <[email protected]>
---
.../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 433ddb49620ca518..bde6c9b66bf42689 100644
--- a/Documentation/devicetree/bindings/timer/renesas,cmt.yaml
+++ b/Documentation/devicetree/bindings/timer/renesas,cmt.yaml
@@ -82,12 +82,6 @@ properties:
- renesas,r8a77995-cmt0 # 32-bit CMT0 on R-Car D3
- const: renesas,rcar-gen3-cmt0 # 32-bit CMT0 on R-Car Gen3 and RZ/G2

- - 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
@@ -104,6 +98,12 @@ properties:
- renesas,r8a77995-cmt1 # 48-bit CMT on R-Car D3
- const: renesas,rcar-gen3-cmt1 # 48-bit CMT on R-Car Gen3 and RZ/G2

+ - 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
@@ -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:
--
2.25.1

2022-07-20 09:32:36

by Daniel Lezcano

[permalink] [raw]

Subject: Re: [PATCH] dt-bindings: timer: renesas,cmt: Fix R-Car Gen4 fall-out

---

On 20/07/2022 09:53, Geert Uytterhoeven wrote:
> 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 <[email protected]>
> ---

Applied, thanks


--
<http://www.linaro.org/> Linaro.org │ Open source software for ARM SoCs

Follow Linaro: <http://www.facebook.com/pages/Linaro> Facebook |
<http://twitter.com/#!/linaroorg> Twitter |
<http://www.linaro.org/linaro-blog/> Blog

2022-07-22 08:26:49

by Wolfram Sang

[permalink] [raw]

Subject: Re: [PATCH] dt-bindings: timer: renesas,cmt: Fix R-Car Gen4 fall-out

---

On Wed, Jul 20, 2022 at 09:53:34AM +0200, Geert Uytterhoeven wrote:
> 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 <[email protected]>

Thank you, Geert, looks good to me!

Reviewed-by: Wolfram Sang <[email protected]>

---

Attachments:

(No filename) (472.00 B)
signature.asc (849.00 B)
Download all attachments