Merge branch 'msm-core' into for-next

* msm-core:
  ARM: msm: Wait for timer clear to complete
  ARM: msm: Rework timer binding to be more general

diff --cc arch/arm/mach-msm/timer.c
index f9fd77e8f1f5a998af7b8f15e12af3afd5bcc299,b4b0d79476a85e02b24fa26405aff65f20ea3471..284313f3e02cb1edd56cfd25a425efe40a5207a1
--- 1/arch/arm/mach-msm/timer.c
--- 2/arch/arm/mach-msm/timer.c
+++ b/arch/arm/mach-msm/timer.c
@@@ -62,11 -65,13 +65,16 @@@ static int msm_timer_set_next_event(uns
  {
        u32 ctrl = readl_relaxed(event_base + TIMER_ENABLE);
  
 -      writel_relaxed(0, event_base + TIMER_CLEAR);
 +      ctrl &= ~TIMER_ENABLE_EN;
 +      writel_relaxed(ctrl, event_base + TIMER_ENABLE);
 +
 +      writel_relaxed(ctrl, event_base + TIMER_CLEAR);
        writel_relaxed(cycles, event_base + TIMER_MATCH_VAL);
+ 
+       if (sts_base)
+               while (readl_relaxed(sts_base) & TIMER_STS_GPT0_CLR_PEND)
+                       cpu_relax();
+ 
        writel_relaxed(ctrl | TIMER_ENABLE_EN, event_base + TIMER_ENABLE);
        return 0;
  }