Linux kernel mirror (for testing) git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git
kernel os linux

dt-bindings: timer: renesas, cmt: Fix SoC-specific compatible values

While the new family-specific compatible values introduced by commit
6f54cc1adcc8957f ("devicetree: bindings: R-Car Gen2 CMT0 and CMT1
bindings") use the recommended order "<vendor>,<family>-<device>", the
new SoC-specific compatible values still use the old and deprecated
order "<vendor>,<device>-<soc>".

Switch the SoC-specific compatible values to the recommended order while
there are no upstream users of these compatible values yet.

Fixes: 7f03a0ecfdc786c1 ("devicetree: bindings: r8a73a4 and R-Car Gen2 CMT bindings")
Fixes: 63d9e8ca0dd4bfa4 ("devicetree: bindings: Deprecate property, update example")
Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Acked-by: Rob Herring <robh@kernel.org>
Reviewed-by: Laurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org>

authored by

Geert Uytterhoeven and committed by
Daniel Lezcano
e20824e9 1843594c

+12 -12
+12 -12
Documentation/devicetree/bindings/timer/renesas,cmt.txt
··· 20 20 (CMT1 on sh73a0 and r8a7740) 21 21 This is a fallback for the above renesas,cmt-48-* entries. 22 22 23 - - "renesas,cmt0-r8a73a4" for the 32-bit CMT0 device included in r8a73a4. 24 - - "renesas,cmt1-r8a73a4" for the 48-bit CMT1 device included in r8a73a4. 25 - - "renesas,cmt0-r8a7790" for the 32-bit CMT0 device included in r8a7790. 26 - - "renesas,cmt1-r8a7790" for the 48-bit CMT1 device included in r8a7790. 27 - - "renesas,cmt0-r8a7791" for the 32-bit CMT0 device included in r8a7791. 28 - - "renesas,cmt1-r8a7791" for the 48-bit CMT1 device included in r8a7791. 29 - - "renesas,cmt0-r8a7793" for the 32-bit CMT0 device included in r8a7793. 30 - - "renesas,cmt1-r8a7793" for the 48-bit CMT1 device included in r8a7793. 31 - - "renesas,cmt0-r8a7794" for the 32-bit CMT0 device included in r8a7794. 32 - - "renesas,cmt1-r8a7794" for the 48-bit CMT1 device included in r8a7794. 23 + - "renesas,r8a73a4-cmt0" for the 32-bit CMT0 device included in r8a73a4. 24 + - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4. 25 + - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790. 26 + - "renesas,r8a7790-cmt1" for the 48-bit CMT1 device included in r8a7790. 27 + - "renesas,r8a7791-cmt0" for the 32-bit CMT0 device included in r8a7791. 28 + - "renesas,r8a7791-cmt1" for the 48-bit CMT1 device included in r8a7791. 29 + - "renesas,r8a7793-cmt0" for the 32-bit CMT0 device included in r8a7793. 30 + - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793. 31 + - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794. 32 + - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794. 33 33 34 34 - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2. 35 35 - "renesas,rcar-gen2-cmt1" for 48-bit CMT1 devices included in R-Car Gen2. ··· 46 46 Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes 47 47 48 48 cmt0: timer@ffca0000 { 49 - compatible = "renesas,cmt0-r8a7790", "renesas,rcar-gen2-cmt0"; 49 + compatible = "renesas,r8a7790-cmt0", "renesas,rcar-gen2-cmt0"; 50 50 reg = <0 0xffca0000 0 0x1004>; 51 51 interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>, 52 52 <0 142 IRQ_TYPE_LEVEL_HIGH>; ··· 55 55 }; 56 56 57 57 cmt1: timer@e6130000 { 58 - compatible = "renesas,cmt1-r8a7790", "renesas,rcar-gen2-cmt1"; 58 + compatible = "renesas,r8a7790-cmt1", "renesas,rcar-gen2-cmt1"; 59 59 reg = <0 0xe6130000 0 0x1004>; 60 60 interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>, 61 61 <0 121 IRQ_TYPE_LEVEL_HIGH>,