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

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

diff --cc MAINTAINERS
Simple merge

diff --cc arch/arm/Kconfig
Simple merge

diff --cc arch/arm/Makefile
Simple merge

diff --cc arch/arm/mach-omap2/clock44xx_data.c
Simple merge

diff --cc arch/arm/mach-omap2/cm-regbits-44xx.h
index 0e77945d26ec8c7a84fffc28869dee87f8797b8f,28e20d3a9f77a6e98828bef4f45e37a88eb65dc5..b53f9fb95dc99bb03864764eba05baff76a312e1
--- 1/arch/arm/mach-omap2/cm-regbits-44xx.h
--- 2/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_SHADOW_FREQ_CONFIG1, CM_SHADOW_FREQ_CONFIG1_RESTORE */
 -#define OMAP4430_DLL_OVERRIDE_SHIFT                           2
 -#define OMAP4430_DLL_OVERRIDE_MASK                            (1 << 2)
 +/* 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)
+ 
 +/* 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 cb26d49a8cd671266ec585b8bf2a6672470cbde7,a0ea5848d40d01a46ea68d25553edab5ee54364c..88633fe01a5dcdc2641afdd3d5010948a3263b73
--- 1/arch/arm/mm/Kconfig
--- 2/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

diff --cc arch/arm/plat-omap/include/plat/clock.h
Simple merge