From: Stephen Rothwell <sfr@canb.auug.org.au>
Date: Wed, 31 Oct 2012 05:41:04 +0000 (+1100)
Subject: Merge remote-tracking branch 'clk/clk-next'
X-Git-Tag: next-20121031~6
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=80396fad37fe3fcc657b44e88461b548f42b71dd;p=karo-tx-linux.git

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

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

80396fad37fe3fcc657b44e88461b548f42b71dd
diff --cc arch/arm/include/asm/hardware/sp810.h
index 2cdcf4476769,afd7e916472f..6636430dd0e6
--- a/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 */