Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit e20824e9 authored by Geert Uytterhoeven's avatar Geert Uytterhoeven Committed by Daniel Lezcano
Browse files

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



While the new family-specific compatible values introduced by commit
6f54cc1a ("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: 7f03a0ec ("devicetree: bindings: r8a73a4 and R-Car Gen2 CMT bindings")
Fixes: 63d9e8ca ("devicetree: bindings: Deprecate property, update example")
Signed-off-by: default avatarGeert Uytterhoeven <geert+renesas@glider.be>
Acked-by: default avatarRob Herring <robh@kernel.org>
Reviewed-by: default avatarLaurent Pinchart <laurent.pinchart@ideasonboard.com>
Signed-off-by: default avatarDaniel Lezcano <daniel.lezcano@linaro.org>
parent 1843594c

Documentation/devicetree/bindings/timer/renesas,cmt.txt

+12 −12
Original line number Original line Diff line number Diff line
@@ -20,16 +20,16 @@ Required Properties: 
		(CMT1 on sh73a0 and r8a7740)

		(CMT1 on sh73a0 and r8a7740)

		This is a fallback for the above renesas,cmt-48-* entries.

		This is a fallback for the above renesas,cmt-48-* entries.





    - "renesas,cmt0-r8a73a4" for the 32-bit CMT0 device included in r8a73a4.

    - "renesas,r8a73a4-cmt0" for the 32-bit CMT0 device included in r8a73a4.

    - "renesas,cmt1-r8a73a4" for the 48-bit CMT1 device included in r8a73a4.

    - "renesas,r8a73a4-cmt1" for the 48-bit CMT1 device included in r8a73a4.

    - "renesas,cmt0-r8a7790" for the 32-bit CMT0 device included in r8a7790.

    - "renesas,r8a7790-cmt0" for the 32-bit CMT0 device included in r8a7790.

    - "renesas,cmt1-r8a7790" for the 48-bit CMT1 device included in r8a7790.

    - "renesas,r8a7790-cmt1" for the 48-bit CMT1 device included in r8a7790.

    - "renesas,cmt0-r8a7791" for the 32-bit CMT0 device included in r8a7791.

    - "renesas,r8a7791-cmt0" for the 32-bit CMT0 device included in r8a7791.

    - "renesas,cmt1-r8a7791" for the 48-bit CMT1 device included in r8a7791.

    - "renesas,r8a7791-cmt1" for the 48-bit CMT1 device included in r8a7791.

    - "renesas,cmt0-r8a7793" for the 32-bit CMT0 device included in r8a7793.

    - "renesas,r8a7793-cmt0" for the 32-bit CMT0 device included in r8a7793.

    - "renesas,cmt1-r8a7793" for the 48-bit CMT1 device included in r8a7793.

    - "renesas,r8a7793-cmt1" for the 48-bit CMT1 device included in r8a7793.

    - "renesas,cmt0-r8a7794" for the 32-bit CMT0 device included in r8a7794.

    - "renesas,r8a7794-cmt0" for the 32-bit CMT0 device included in r8a7794.

    - "renesas,cmt1-r8a7794" for the 48-bit CMT1 device included in r8a7794.

    - "renesas,r8a7794-cmt1" for the 48-bit CMT1 device included in r8a7794.





    - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2.

    - "renesas,rcar-gen2-cmt0" for 32-bit CMT0 devices included in R-Car Gen2.

    - "renesas,rcar-gen2-cmt1" for 48-bit CMT1 devices included in R-Car Gen2.

    - "renesas,rcar-gen2-cmt1" for 48-bit CMT1 devices included in R-Car Gen2.
@@ -46,7 +46,7 @@ Required Properties: 
Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes

Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes





	cmt0: timer@ffca0000 {

	cmt0: timer@ffca0000 {

		compatible = "renesas,cmt0-r8a7790", "renesas,rcar-gen2-cmt0";

		compatible = "renesas,r8a7790-cmt0", "renesas,rcar-gen2-cmt0";

		reg = <0 0xffca0000 0 0x1004>;

		reg = <0 0xffca0000 0 0x1004>;

		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,

		interrupts = <0 142 IRQ_TYPE_LEVEL_HIGH>,

			     <0 142 IRQ_TYPE_LEVEL_HIGH>;

			     <0 142 IRQ_TYPE_LEVEL_HIGH>;
@@ -55,7 +55,7 @@ Example: R8A7790 (R-Car H2) CMT0 and CMT1 nodes 
	};

	};





	cmt1: timer@e6130000 {

	cmt1: timer@e6130000 {

		compatible = "renesas,cmt1-r8a7790", "renesas,rcar-gen2-cmt1";

		compatible = "renesas,r8a7790-cmt1", "renesas,rcar-gen2-cmt1";

		reg = <0 0xe6130000 0 0x1004>;

		reg = <0 0xe6130000 0 0x1004>;

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,

		interrupts = <0 120 IRQ_TYPE_LEVEL_HIGH>,

			     <0 121 IRQ_TYPE_LEVEL_HIGH>,

			     <0 121 IRQ_TYPE_LEVEL_HIGH>,