Messages in this thread Patch in this message | | | Date | Mon, 26 Aug 2019 22:52:19 -0000 | From | tip-bot2 for Magnus Damm <> | Subject | [tip: timers/core] clocksource/drivers/sh_cmt: r8a7740 and sh73a0 SoC-specific match |
| |
The following commit has been merged into the timers/core branch of tip:
Commit-ID: 8c1afba285a86b9dbb0637f8c70a34fe2d88569e Gitweb: https://git.kernel.org/tip/8c1afba285a86b9dbb0637f8c70a34fe2d88569e Author: Magnus Damm <damm+renesas@opensource.se> AuthorDate: Tue, 20 Aug 2019 21:35:56 +09:00 Committer: Daniel Lezcano <daniel.lezcano@linaro.org> CommitterDate: Tue, 27 Aug 2019 00:31:39 +02:00
clocksource/drivers/sh_cmt: r8a7740 and sh73a0 SoC-specific match
Add SoC-specific matching for CMT1 on r8a7740 and sh73a0.
This allows us to move away from the old DT bindings such as - "renesas,cmt-48-sh73a0" - "renesas,cmt-48-r8a7740" - "renesas,cmt-48" in favour for the now commonly used format "renesas,<soc>-<device>"
Signed-off-by: Magnus Damm <damm+renesas@opensource.se> Reviewed-by: Simon Horman <horms+renesas@verge.net.au> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be> Signed-off-by: Daniel Lezcano <daniel.lezcano@linaro.org> --- drivers/clocksource/sh_cmt.c | 8 ++++++++ 1 file changed, 8 insertions(+)
diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index f6424b6..abf5e78 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -925,6 +925,14 @@ static const struct of_device_id sh_cmt_of_table[] __maybe_unused = { .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] }, { + .compatible = "renesas,r8a7740-cmt1", + .data = &sh_cmt_info[SH_CMT_48BIT] + }, + { + .compatible = "renesas,sh73a0-cmt1", + .data = &sh_cmt_info[SH_CMT_48BIT] + }, + { .compatible = "renesas,rcar-gen2-cmt0", .data = &sh_cmt_info[SH_CMT0_RCAR_GEN2] },
| |