Merge branch 'vt8500/timer' into next/cleanup

* vt8500/timer:
  timer: vt8500: Convert vt8500 to use CLKSRC_OF

Signed-off-by: Olof Johansson <olof@lixom.net>

diff --cc drivers/clocksource/vt8500_timer.c
index ed66cf07d3c6a958245f5131d054a5c89422c3c1,b75b8e31dab4749c227901d2f26752cf68c6f82f..8efc86b5b5ddfe3b216acf331c37003776a06b9f
--- 1/drivers/clocksource/vt8500_timer.c
--- 2/drivers/clocksource/vt8500_timer.c
+++ b/drivers/clocksource/vt8500_timer.c
@@@ -173,7 -179,7 +173,8 @@@ static void __init vt8500_timer_init(vo
        if (setup_irq(timer_irq, &irq))
                pr_err("%s: setup_irq failed for %s\n", __func__,
                                                        clockevent.name);
 -      clockevents_register_device(&clockevent);
 +      clockevents_config_and_register(&clockevent, VT8500_TIMER_HZ,
 +                                      4, 0xf0000000);
  }
  
+ CLOCKSOURCE_OF_DECLARE(vt8500, "via,vt8500-timer", vt8500_timer_init)