Merge tag 'timers-v5.6' of https://git.linaro.org/people/daniel.lezcano/linux into...

Pull clockevent updates from Daniel Lezcano:

 - Some cleanups for the timer-of, use %p0F and the unique device name
   (Geert Uytterhoeven)

 - Use timer-of for the renesas-ostm and the device name to prevent
   name collision in case of multiple timers (Geert Uytterhoeven)

 - Check if there is an error after calling of_clk_get in asm9260
   (Chuhong Yuan)

diff --combined drivers/clocksource/timer-of.c
index 11ff701ff4bb99076a4e19b9faa10e1bd8229d7b,8c11bd743dd016c9a0572da9657a635810904b84..572da477c6d35c5edc64f16b5d8562cde5311d53
--- 1/drivers/clocksource/timer-of.c
--- 2/drivers/clocksource/timer-of.c
+++ b/drivers/clocksource/timer-of.c
@@@ -25,9 -25,7 +25,9 @@@ static __init void timer_of_irq_exit(st
  
        struct clock_event_device *clkevt = &to->clkevt;
  
 -      of_irq->percpu ? free_percpu_irq(of_irq->irq, clkevt) :
 +      if (of_irq->percpu)
 +              free_percpu_irq(of_irq->irq, clkevt);
 +      else
                free_irq(of_irq->irq, clkevt);
  }
  
@@@ -57,8 -55,8 +57,8 @@@ static __init int timer_of_irq_init(str
        if (of_irq->name) {
                of_irq->irq = ret = of_irq_get_byname(np, of_irq->name);
                if (ret < 0) {
-                       pr_err("Failed to get interrupt %s for %s\n",
-                              of_irq->name, np->full_name);
+                       pr_err("Failed to get interrupt %s for %pOF\n",
+                              of_irq->name, np);
                        return ret;
                }
        } else  {
@@@ -192,7 -190,7 +192,7 @@@ int __init timer_of_init(struct device_
        }
  
        if (!to->clkevt.name)
-               to->clkevt.name = np->name;
+               to->clkevt.name = np->full_name;
  
        to->np = np;