[2/3] clocksource/drivers/sh_cmt: Remove "cmt-48-gen2" support
diff mbox series

Message ID 156076562362.6960.14055306539589207977.sendpatchset@octo
State Under Review
Delegated to: Geert Uytterhoeven
Headers show
Series
  • clocksource/drivers/sh_cmt: Minor DT compat string update
Related show

Commit Message

Magnus Damm June 17, 2019, 10 a.m. UTC
From: Magnus Damm <damm+renesas@opensource.se>

Since late 2017 the DT compat string "renesas,cmt-48-gen2" has not been in
use in the upstream kernel. SoC-specific strings and the fallback string
"rcar-gen2-cmt1" are now used in the DTSI instead.

Remove "renesas,cmt-48-gen2" from the CMT driver.

Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
---

 drivers/clocksource/sh_cmt.c |    5 -----
 1 file changed, 5 deletions(-)

Comments

Geert Uytterhoeven June 18, 2019, 2:01 p.m. UTC | #1
Hi Magnus,

On Mon, Jun 17, 2019 at 11:59 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> From: Magnus Damm <damm+renesas@opensource.se>
>
> Since late 2017 the DT compat string "renesas,cmt-48-gen2" has not been in
> use in the upstream kernel. SoC-specific strings and the fallback string
> "rcar-gen2-cmt1" are now used in the DTSI instead.

Not really: since v4.16, which was released on Apr 1, 2018, i.e. after v4.14,
the base for the latest LTSI kernel.

Note that the removal commits were backported to v4.14-ltsi, but not to
v4.14.y.

> Remove "renesas,cmt-48-gen2" from the CMT driver.
>
> Signed-off-by: Magnus Damm <damm+renesas@opensource.se>

Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>

Gr{oetje,eeting}s,

                        Geert
Magnus Damm June 18, 2019, 2:54 p.m. UTC | #2
Hi Geert,

On Tue, Jun 18, 2019 at 11:01 PM Geert Uytterhoeven
<geert@linux-m68k.org> wrote:
>
> Hi Magnus,
>
> On Mon, Jun 17, 2019 at 11:59 AM Magnus Damm <magnus.damm@gmail.com> wrote:
> > From: Magnus Damm <damm+renesas@opensource.se>
> >
> > Since late 2017 the DT compat string "renesas,cmt-48-gen2" has not been in
> > use in the upstream kernel. SoC-specific strings and the fallback string
> > "rcar-gen2-cmt1" are now used in the DTSI instead.
>
> Not really: since v4.16, which was released on Apr 1, 2018, i.e. after v4.14,
> the base for the latest LTSI kernel.
>
> Note that the removal commits were backported to v4.14-ltsi, but not to
> v4.14.y.

You are right. I was looking at the commit date in git of:
https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git/commit/?id=98b6b8b493a99d828e6665e6e67d6ca077c1aee0

Actually the first version of the series  "[PATCH 00/08] clocksource:
sh_cmt: DT binding rework" was posted in mid-2015, but I guess I lost
interest at some point. =)

Thanks for your help!

/ magnus

> > Remove "renesas,cmt-48-gen2" from the CMT driver.
> >
> > Signed-off-by: Magnus Damm <damm+renesas@opensource.se>
>
> Reviewed-by: Geert Uytterhoeven <geert+renesas@glider.be>
>
> Gr{oetje,eeting}s,
>
>                         Geert
>
> --
> Geert Uytterhoeven -- There's lots of Linux beyond ia32 -- geert@linux-m68k.org
>
> In personal conversations with technical people, I call myself a hacker. But
> when I'm talking to journalists I just say "programmer" or something like that.
>                                 -- Linus Torvalds

Patch
diff mbox series

--- 0027/drivers/clocksource/sh_cmt.c
+++ work/drivers/clocksource/sh_cmt.c	2019-06-17 14:44:52.819144991 +0900
@@ -923,11 +923,6 @@  MODULE_DEVICE_TABLE(platform, sh_cmt_id_
 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-gen2",
-		.data = &sh_cmt_info[SH_CMT0_RCAR_GEN2]
-	},
-	{
 		.compatible = "renesas,r8a7740-cmt1",
 		.data = &sh_cmt_info[SH_CMT_48BIT]
 	},