Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/rkuo/linux...

[linux.git] / drivers / clocksource / sh_cmt.c

diff --git a/drivers/clocksource/sh_cmt.c b/drivers/clocksource/sh_cmt.c
index 55d3e03f2cd4fefa02ed8be70aa96c7472687eeb..ef773db080e903002b693b41b961a2d48e0f5e53 100644 (file)
--- a/drivers/clocksource/sh_cmt.c
+++ b/drivers/clocksource/sh_cmt.c
@@ -776,11 +776,8 @@ static int sh_cmt_register_clockevent(struct sh_cmt_channel *ch,
        int ret;
 
        irq = platform_get_irq(ch->cmt->pdev, ch->index);
-       if (irq < 0) {
-               dev_err(&ch->cmt->pdev->dev, "ch%u: failed to get irq\n",
-                       ch->index);
+       if (irq < 0)
                return irq;
-       }
 
        ret = request_irq(irq, sh_cmt_interrupt,
                          IRQF_TIMER | IRQF_IRQPOLL | IRQF_NOBALANCING,
@@ -921,12 +918,24 @@ 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",
                .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]