The following commit has been merged into the timers/core branch of tip: Commit-ID: 19d608458f4f3bb3a1f89bd7e4814c3fd30dbec7 Gitweb: https://git.kernel.org/tip/19d608458f4f3bb3a1f89bd7e4814c3fd30dbec7 Author: Magnus Damm <damm+rene...@opensource.se> AuthorDate: Tue, 20 Aug 2019 21:36:07 +09:00 Committer: Daniel Lezcano <daniel.lezc...@linaro.org> CommitterDate: Tue, 27 Aug 2019 00:31:39 +02:00
clocksource/drivers/sh_cmt: Document "cmt-48" as deprecated Update the CMT driver to mark "renesas,cmt-48" as deprecated. Instead of documenting a theoretical hardware device based on current software support level, define DT bindings top-down based on available data sheet information and make use of part numbers in the DT compat string. In case of the only in-tree users r8a7740 and sh73a0 the compat strings "renesas,r8a7740-cmt1" and "renesas,sh73a0-cmt1" may be used instead. Signed-off-by: Magnus Damm <damm+rene...@opensource.se> Reviewed-by: Simon Horman <horms+rene...@verge.net.au> Reviewed-by: Geert Uytterhoeven <geert+rene...@glider.be> Signed-off-by: Daniel Lezcano <daniel.lezc...@linaro.org> --- drivers/clocksource/sh_cmt.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c index abf5e78..ef773db 100644 --- a/drivers/clocksource/sh_cmt.c +++ b/drivers/clocksource/sh_cmt.c @@ -918,7 +918,11 @@ static const struct platform_device_id sh_cmt_id_table[] = { MODULE_DEVICE_TABLE(platform, sh_cmt_id_table); static const struct of_device_id sh_cmt_of_table[] __maybe_unused = { - { .compatible = "renesas,cmt-48", .data = &sh_cmt_info[SH_CMT_48BIT] }, + { + /* deprecated, preserved for backward compatibility */ + .compatible = "renesas,cmt-48", + .data = &sh_cmt_info[SH_CMT_48BIT] + }, { /* deprecated, preserved for backward compatibility */ .compatible = "renesas,cmt-48-gen2",