Skip to content
This repository has been archived by the owner on Mar 15, 2022. It is now read-only.

Commit

Permalink
ARM: dts: shmobile: Update CMT1 compatible values
Browse files Browse the repository at this point in the history
New compatible values were introduced for the 48-bit CMT devices on
SH-Mobile AG5 and R-Mobile A1, and the old "cmt-48"-based values were
deprecated.  However, the actual DTS files were never updated.

See also commits:
  - 81b604c ("dt-bindings: timer: renesas, cmt: Update CMT1 on
    sh73a0 and r8a7740"),
  - 8c1afba ("clocksource/drivers/sh_cmt: r8a7740 and sh73a0
    SoC-specific match"),
  - 19d6084 ("clocksource/drivers/sh_cmt: Document "cmt-48" as
    deprecated").

Signed-off-by: Geert Uytterhoeven <geert+renesas@glider.be>
Link: https://lore.kernel.org/r/20200420151553.22975-1-geert+renesas@glider.be

[ upstream commit: fea89b2 ]
  • Loading branch information
geertu committed Apr 27, 2020
1 parent 6e6f52a commit 35a5204
Show file tree
Hide file tree
Showing 2 changed files with 2 additions and 2 deletions.
2 changes: 1 addition & 1 deletion src/arm/r8a7740.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -83,7 +83,7 @@
};

cmt1: timer@e6138000 {
compatible = "renesas,cmt-48-r8a7740", "renesas,cmt-48";
compatible = "renesas,r8a7740-cmt1";
reg = <0xe6138000 0x170>;
interrupts = <GIC_SPI 58 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks R8A7740_CLK_CMT1>;
Expand Down
2 changes: 1 addition & 1 deletion src/arm/sh73a0.dtsi
Original file line number Diff line number Diff line change
Expand Up @@ -99,7 +99,7 @@
};

cmt1: timer@e6138000 {
compatible = "renesas,cmt-48-sh73a0", "renesas,cmt-48";
compatible = "renesas,sh73a0-cmt1";
reg = <0xe6138000 0x200>;
interrupts = <GIC_SPI 65 IRQ_TYPE_LEVEL_HIGH>;
clocks = <&mstp3_clks SH73A0_CLK_CMT1>;
Expand Down

0 comments on commit 35a5204

Please sign in to comment.