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

Conflicts:
	arch/arm/include/asm/hardware/sp810.h

diff --cc arch/arm/include/asm/hardware/sp810.h
index 2cdcf4476769d3e3aae22c07a4a670b780d8576e,afd7e916472f62a8a80c3ff7db8977d0e63ea4c0..6636430dd0e6193ed91301d1a42e928204b8e511
--- 1/arch/arm/include/asm/hardware/sp810.h
--- 2/arch/arm/include/asm/hardware/sp810.h
+++ b/arch/arm/include/asm/hardware/sp810.h
@@@ -50,6 -50,14 +50,8 @@@
  #define SCPCELLID2            0xFF8
  #define SCPCELLID3            0xFFC
  
 -#define SCCTRL_TIMEREN0SEL_REFCLK     (0 << 15)
 -#define SCCTRL_TIMEREN0SEL_TIMCLK     (1 << 15)
 -
 -#define SCCTRL_TIMEREN1SEL_REFCLK     (0 << 17)
 -#define SCCTRL_TIMEREN1SEL_TIMCLK     (1 << 17)
 -
+ #define SCCTRL_TIMERENnSEL_SHIFT(n)   (15 + ((n) * 2))
+ 
  static inline void sysctl_soft_reset(void __iomem *base)
  {
        /* switch to slow mode */