From: Arnd Bergmann Date: Mon, 14 May 2012 15:43:35 +0000 (+0200) Subject: Merge branches 'spear/clock' and 'imx/clock' into next/clock X-Git-Url: https://git.stricted.de/?a=commitdiff_plain;h=fcd8d84a585f3578a9ebdd27e757495a27415322;p=GitHub%2Fexynos8895%2Fandroid_kernel_samsung_universal8895.git Merge branches 'spear/clock' and 'imx/clock' into next/clock Updated to resolve dependencies. Signed-off-by: Arnd Bergmann --- fcd8d84a585f3578a9ebdd27e757495a27415322 diff --cc MAINTAINERS index b7adeed338d4,27085a75162f,bb76fc42fc42..09c8892a6206 --- a/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 -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 - 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 L: spi-devel-general@lists.sourceforge.net diff --cc arch/arm/Kconfig index 40ba2d1acde2,ce030c242644,c67494fc05a7..f0fc52784ebc --- a/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