diff options
| author |   Geert Uytterhoeven <geert+renesas@glider.be> | 2022-07-20 09:53:34 +0200 |
|---|---|---|
| committer |   Daniel Lezcano <daniel.lezcano@linaro.org> | 2022-07-27 17:01:52 +0200 |
| commit | 4abb38595b1b116bd1440c76c69c9f0416ec55a4 (patch) | |
| tree | 5440714566f9dc0109b7bc3738f5cfac3e4b9a31 /Documentation | |
| parent | clocksource/drivers/tegra186: Put Kconfig option 'tristate' to 'bool' (diff) | |
| download | wireguard-linux-4abb38595b1b116bd1440c76c69c9f0416ec55a4.tar.xz wireguard-linux-4abb38595b1b116bd1440c76c69c9f0416ec55a4.zip | |
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@glider.be>
Acked-by: Krzysztof Kozlowski <krzysztof.kozlowski@linaro.org>
Link: https://lore.kernel.org/r/2e3863ae32e17d49f41111580f195dd34e2b769d.1658303544.git.geert+renesas@glider.be
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>
Diffstat (limited to 'Documentation')
| -rw-r--r-- | Documentation/devicetree/bindings/timer/renesas,cmt.yaml | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/Documentation/devicetree/bindings/timer/renesas,cmt.yaml b/Documentation/devicetree/bindings/timer/renesas,cmt.yaml index 433ddb49620c..bde6c9b66bf4 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: |