Merge tag 'xtensa-20191201' of git://github.com/jcmvbkbc/linux-xtensa

[linux.git] / drivers / clocksource / renesas-ostm.c

diff --git a/drivers/clocksource/renesas-ostm.c b/drivers/clocksource/renesas-ostm.c
index 46012d905604bc4394a16c81acd3e5570b698c6e..3d06ba66008c70294a9da6059e1d46ce8ddcaeec 100644 (file)
--- a/drivers/clocksource/renesas-ostm.c
+++ b/drivers/clocksource/renesas-ostm.c
@@ -64,9 +64,9 @@ static int __init ostm_init_clksrc(struct timer_of *to)
        writeb(CTL_FREERUN, timer_of_base(to) + OSTM_CTL);
        writeb(TS, timer_of_base(to) + OSTM_TS);
 
-       return clocksource_mmio_init(timer_of_base(to) + OSTM_CNT, "ostm",
-                                    timer_of_rate(to), 300, 32,
-                                    clocksource_mmio_readl_up);
+       return clocksource_mmio_init(timer_of_base(to) + OSTM_CNT,
+                                    to->np->full_name, timer_of_rate(to), 300,
+                                    32, clocksource_mmio_readl_up);
 }
 
 static u64 notrace ostm_read_sched_clock(void)
@@ -190,13 +190,13 @@ static int __init ostm_init(struct device_node *np)
                        goto err_cleanup;
 
                ostm_init_sched_clock(to);
-               pr_info("ostm: used for clocksource\n");
+               pr_info("%pOF: used for clocksource\n", np);
        } else {
                ret = ostm_init_clkevt(to);
                if (ret)
                        goto err_cleanup;
 
-               pr_info("ostm: used for clock events\n");
+               pr_info("%pOF: used for clock events\n", np);
        }
 
        return 0;