Merge branches 'spear/clock' and 'imx/clock' into next/clock

Updated to resolve dependencies.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>

diff --cc MAINTAINERS
index b7adeed,27085a7,bb76fc4..09c8892
--- 1/MAINTAINERS
--- 2/MAINTAINERS
--- 3/MAINTAINERS
+++ b/MAINTAINERS
@@@@ -6334,23 -6344,8 -6327,25 +6342,8 @@@@ L:  spear-devel@list.st.co
   L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
   W:   http://www.st.com/spear
   S:   Maintained
  -F:   arch/arm/mach-spear*/clock.c
  -F:   arch/arm/plat-spear/clock.c
  -F:   arch/arm/plat-spear/include/plat/clock.h
  -
  -SPEAR PAD MULTIPLEXING SUPPORT
  -M:   Viresh Kumar <viresh.kumar@st.com>
  -L:   spear-devel@list.st.com
  -L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
  -W:   http://www.st.com/spear
  -S:   Maintained
  -F:   arch/arm/plat-spear/include/plat/padmux.h
  -F:   arch/arm/plat-spear/padmux.c
  -F:   arch/arm/mach-spear*/spear*xx.c
  -F:   arch/arm/mach-spear*/include/mach/generic.h
  -F:   arch/arm/mach-spear3xx/spear3*0.c
  -F:   arch/arm/mach-spear3xx/spear3*0_evb.c
  -F:   arch/arm/mach-spear6xx/spear600.c
  -F:   arch/arm/mach-spear6xx/spear600_evb.c
  +F:   drivers/clk/spear/
   
-  SPEAR PAD MULTIPLEXING SUPPORT
-  M:   Viresh Kumar <viresh.kumar@st.com>
-  L:   spear-devel@list.st.com
-  L:   linux-arm-kernel@lists.infradead.org (moderated for non-subscribers)
-  W:   http://www.st.com/spear
-  S:   Maintained
-  F:   arch/arm/plat-spear/include/plat/padmux.h
-  F:   arch/arm/plat-spear/padmux.c
-  F:   arch/arm/mach-spear*/spear*xx.c
-  F:   arch/arm/mach-spear*/include/mach/generic.h
-  F:   arch/arm/mach-spear3xx/spear3*0.c
-  F:   arch/arm/mach-spear3xx/spear3*0_evb.c
-  F:   arch/arm/mach-spear6xx/spear600.c
-  F:   arch/arm/mach-spear6xx/spear600_evb.c
-  
   SPI SUBSYSTEM
   M:   Grant Likely <grant.likely@secretlab.ca>
   L:   spi-devel-general@lists.sourceforge.net

diff --cc arch/arm/Kconfig
index 40ba2d1,ce030c2,c67494f..f0fc527
--- 1/arch/arm/Kconfig
--- 2/arch/arm/Kconfig
--- 3/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@@@ -468,8 -468,7 -468,8 +468,9 @@@@ config ARCH_MX
        select ARCH_REQUIRE_GPIOLIB
        select CLKDEV_LOOKUP
        select CLKSRC_MMIO
 ++     select COMMON_CLK
        select HAVE_CLK_PREPARE
++      select PINCTRL
        help
          Support for Freescale MXS-based family of processors
   

diff --cc arch/arm/mach-mxs/include/mach/common.h
Simple merge

diff --cc arch/arm/mach-mxs/mach-mx28evk.c
Simple merge

diff --cc drivers/i2c/busses/i2c-mxs.c
Simple merge