From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Mon, 6 Jan 2014 07:20:04 +0000 (+1100)
Subject: Merge remote-tracking branch 'clockevents/clockevents/next'
X-Git-Tag: next-20140106~28
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=81f3b18259b5a3a3e0f71cef698a5754262ad185;p=karo-tx-linux.git

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

Conflicts:
	drivers/clocksource/clksrc-of.c
---

81f3b18259b5a3a3e0f71cef698a5754262ad185
diff --cc drivers/clocksource/clksrc-of.c
index b9ddd9e3a2f5,a30b42c3ac3b..ae2e4278c42a
--- a/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/time-armada-370-xp.c
index 4e7f6802e840,0450f6b69ade..ee8691b89944
--- a/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);