Merge remote-tracking branch 'clockevents/clockevents/next'

Conflicts:
	drivers/clocksource/clksrc-of.c

diff --cc arch/arm/boot/dts/sun7i-a20.dtsi
Simple merge

diff --cc drivers/clocksource/Kconfig
Simple merge

diff --cc drivers/clocksource/clksrc-of.c
index b9ddd9e3a2f599e2cc7424c1eac18d4280b2f850,a30b42c3ac3bdc483490a1bc781e663fc91edab5..ae2e4278c42abd75358279e937e991497097a2e6
--- 1/drivers/clocksource/clksrc-of.c
--- 2/drivers/clocksource/clksrc-of.c
+++ b/drivers/clocksource/clksrc-of.c
@@@ -35,5 -36,9 +36,8 @@@ void __init clocksource_of_init(void
  
                init_func = match->data;
                init_func(np);
 -              of_node_put(np);
+               clocksources++;
        }
+       if (!clocksources)
+               pr_crit("%s: no matching clocksources found\n", __func__);
  }

diff --cc drivers/clocksource/nomadik-mtu.c
Simple merge

diff --cc drivers/clocksource/sh_mtu2.c
Simple merge

diff --cc drivers/clocksource/sh_tmu.c
Simple merge

diff --cc drivers/clocksource/sun4i_timer.c
Simple merge

diff --cc drivers/clocksource/time-armada-370-xp.c
index 4e7f6802e840ba9379eb42d733801526d173e89e,0450f6b69ade314d023095c83e37720cab7e731a..ee8691b89944e3fcbc3dbf7eeaadf00ec38ffd93
--- 1/drivers/clocksource/time-armada-370-xp.c
--- 2/drivers/clocksource/time-armada-370-xp.c
+++ b/drivers/clocksource/time-armada-370-xp.c
@@@ -262,14 -268,8 +263,13 @@@ static void __init armada_370_xp_timer_
        writel(0xffffffff, timer_base + TIMER0_VAL_OFF);
        writel(0xffffffff, timer_base + TIMER0_RELOAD_OFF);
  
-       timer_ctrl_clrset(0, TIMER0_EN | TIMER0_RELOAD_EN |
-                            TIMER0_DIV(TIMER_DIVIDER_SHIFT));
+       timer_ctrl_clrset(0, TIMER0_RELOAD_EN | enable_mask);
  
 +      /*
 +       * Set scale and timer for sched_clock.
 +       */
 +      sched_clock_register(armada_370_xp_read_sched_clock, 32, timer_clk);
 +
        clocksource_mmio_init(timer_base + TIMER0_VAL_OFF,
                              "armada_370_xp_clocksource",
                              timer_clk, 300, 32, clocksource_mmio_readl_down);