From: Arnd Bergmann <arnd@arndb.de>
Date: Tue, 26 Jul 2011 16:54:04 +0000 (+0000)
Subject: Merge branch 'next/soc' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm... 
X-Git-Tag: next-20110727~75^2~2
X-Git-Url: https://git.karo-electronics.de/?a=commitdiff_plain;h=768bdea1ff6fc1a596bde576d522da24a43d07a4;p=karo-tx-linux.git

Merge branch 'next/soc' of git+ssh://master.kernel.org/pub/scm/linux/kernel/git/arm/linux-arm-soc into tmp/merge

Conflicts:
	arch/arm/mach-omap2/cm-regbits-44xx.h
	arch/arm/mm/Kconfig
---

768bdea1ff6fc1a596bde576d522da24a43d07a4
diff --cc arch/arm/mach-omap2/cm-regbits-44xx.h
index 0e77945d26ec,28e20d3a9f77..b53f9fb95dc9
--- a/arch/arm/mach-omap2/cm-regbits-44xx.h
+++ b/arch/arm/mach-omap2/cm-regbits-44xx.h
@@@ -555,24 -588,37 +571,36 @@@
  #define OMAP4430_D2D_STATDEP_SHIFT				18
  #define OMAP4430_D2D_STATDEP_MASK				(1 << 18)
  
+ /* Used by CM_CLKSEL_DPLL_MPU */
+ #define OMAP4460_DCC_COUNT_MAX_SHIFT				24
+ #define OMAP4460_DCC_COUNT_MAX_MASK				(0xff << 24)
+ 
+ /* Used by CM_CLKSEL_DPLL_MPU */
+ #define OMAP4460_DCC_EN_SHIFT					22
+ #define OMAP4460_DCC_EN_MASK					(1 << 22)
+ 
  /*
   * Used by CM_SSC_DELTAMSTEP_DPLL_ABE, CM_SSC_DELTAMSTEP_DPLL_CORE,
 - * CM_SSC_DELTAMSTEP_DPLL_CORE_RESTORE, CM_SSC_DELTAMSTEP_DPLL_DDRPHY,
 - * CM_SSC_DELTAMSTEP_DPLL_IVA, CM_SSC_DELTAMSTEP_DPLL_MPU,
 - * CM_SSC_DELTAMSTEP_DPLL_PER, CM_SSC_DELTAMSTEP_DPLL_UNIPRO,
 - * CM_SSC_DELTAMSTEP_DPLL_USB
 + * CM_SSC_DELTAMSTEP_DPLL_DDRPHY, CM_SSC_DELTAMSTEP_DPLL_IVA,
 + * CM_SSC_DELTAMSTEP_DPLL_MPU, CM_SSC_DELTAMSTEP_DPLL_PER,
 + * CM_SSC_DELTAMSTEP_DPLL_UNIPRO, CM_SSC_DELTAMSTEP_DPLL_USB
   */
  #define OMAP4430_DELTAMSTEP_SHIFT				0
  #define OMAP4430_DELTAMSTEP_MASK				(0xfffff << 0)
  
 +/* Used by CM_DLL_CTRL */
 +#define OMAP4430_DLL_OVERRIDE_SHIFT				0
 +#define OMAP4430_DLL_OVERRIDE_MASK				(1 << 0)
 +
+ /* Renamed from DELTAMSTEP Used by CM_SSC_DELTAMSTEP_DPLL_USB */
+ #define OMAP4460_DELTAMSTEP_0_20_SHIFT				0
+ #define OMAP4460_DELTAMSTEP_0_20_MASK				(0x1fffff << 0)
+ 
 -/* Used by CM_SHADOW_FREQ_CONFIG1, CM_SHADOW_FREQ_CONFIG1_RESTORE */
 -#define OMAP4430_DLL_OVERRIDE_SHIFT				2
 -#define OMAP4430_DLL_OVERRIDE_MASK				(1 << 2)
 +/* Renamed from DLL_OVERRIDE Used by CM_SHADOW_FREQ_CONFIG1 */
 +#define OMAP4430_DLL_OVERRIDE_2_2_SHIFT				2
 +#define OMAP4430_DLL_OVERRIDE_2_2_MASK				(1 << 2)
  
 -/* Renamed from DLL_OVERRIDE Used by CM_DLL_CTRL */
 -#define OMAP4430_DLL_OVERRIDE_0_0_SHIFT				0
 -#define OMAP4430_DLL_OVERRIDE_0_0_MASK				(1 << 0)
 -
 -/* Used by CM_SHADOW_FREQ_CONFIG1, CM_SHADOW_FREQ_CONFIG1_RESTORE */
 +/* Used by CM_SHADOW_FREQ_CONFIG1 */
  #define OMAP4430_DLL_RESET_SHIFT				3
  #define OMAP4430_DLL_RESET_MASK					(1 << 3)
  
diff --cc arch/arm/mm/Kconfig
index cb26d49a8cd6,a0ea5848d40d..88633fe01a5d
--- a/arch/arm/mm/Kconfig
+++ b/arch/arm/mm/Kconfig
@@@ -821,7 -821,8 +821,8 @@@ config CACHE_L2X
  	depends on REALVIEW_EB_ARM11MP || MACH_REALVIEW_PB11MP || MACH_REALVIEW_PB1176 || \
  		   REALVIEW_EB_A9MP || SOC_IMX35 || SOC_IMX31 || MACH_REALVIEW_PBX || \
  		   ARCH_NOMADIK || ARCH_OMAP4 || ARCH_EXYNOS4 || ARCH_TEGRA || \
- 		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || ARCH_CNS3XXX
+ 		   ARCH_U8500 || ARCH_VEXPRESS_CA9X4 || ARCH_SHMOBILE || \
 -		   ARCH_PRIMA2 || ARCH_ZYNQ
++		   ARCH_PRIMA2 || ARCH_ZYNQ || ARCH_CNS3XXX
  	default y
  	select OUTER_CACHE
  	select OUTER_CACHE_SYNC