linux-toradex.git/arch/arm/mach-mxs, branch v3.3.4 Linux kernel for Apalis and Colibri modules Merge tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc 2012-01-09T22:44:15+00:00 Linus Torvalds torvalds@linux-foundation.org 2012-01-09T22:44:15+00:00 979ecef5b89a8003902299566d9cdc08de34a3ee clock management changes for i.MX Another simple series related to clock management, this time only for imx. * tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc: ARM: mxs: select HAVE_CLK_PREPARE for clock clk: add config option HAVE_CLK_PREPARE into Kconfig ASoC: mxs-saif: convert to clk_prepare/clk_unprepare video: mxsfb: convert to clk_prepare/clk_unprepare serial: mxs-auart: convert to clk_prepare/clk_unprepare net: flexcan: convert to clk_prepare/clk_unprepare mtd: gpmi-lib: convert to clk_prepare/clk_unprepare mmc: mxs-mmc: convert to clk_prepare/clk_unprepare dma: mxs-dma: convert to clk_prepare/clk_unprepare net: fec: add clk_prepare/clk_unprepare ARM: mxs: convert platform code to clk_prepare/clk_unprepare clk: add helper functions clk_prepare_enable and clk_disable_unprepare Fix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to commit 0ebafefcaa7a ("net: fec: add clk_prepare/clk_unprepare") clashing trivially with commit e163cc97f9ac ("net/fec: fix the .remove code"). 
clock management changes for i.MX

Another simple series related to clock management, this time only for
imx.

* tag 'clk' of git://git.kernel.org/pub/scm/linux/kernel/git/arm/arm-soc:
  ARM: mxs: select HAVE_CLK_PREPARE for clock
  clk: add config option HAVE_CLK_PREPARE into Kconfig
  ASoC: mxs-saif: convert to clk_prepare/clk_unprepare
  video: mxsfb: convert to clk_prepare/clk_unprepare
  serial: mxs-auart: convert to clk_prepare/clk_unprepare
  net: flexcan: convert to clk_prepare/clk_unprepare
  mtd: gpmi-lib: convert to clk_prepare/clk_unprepare
  mmc: mxs-mmc: convert to clk_prepare/clk_unprepare
  dma: mxs-dma: convert to clk_prepare/clk_unprepare
  net: fec: add clk_prepare/clk_unprepare
  ARM: mxs: convert platform code to clk_prepare/clk_unprepare
  clk: add helper functions clk_prepare_enable and clk_disable_unprepare

Fix up trivial conflicts in drivers/net/ethernet/freescale/fec.c due to
commit 0ebafefcaa7a ("net: fec: add clk_prepare/clk_unprepare") clashing
trivially with commit e163cc97f9ac ("net/fec: fix the .remove code").
Merge branch 'samsung/driver' into next/drivers 2012-01-09T16:16:29+00:00 Arnd Bergmann arnd@arndb.de 2012-01-09T16:16:29+00:00 dcf7ec5ee62a78123057a1e286c88ca739717409 Conflicts: arch/arm/mach-mxs/include/mach/common.h Pull in previous samsung conflict merges and do a trivial merge of an mxs double-add conflict. Signed-off-by: Arnd Bergmann <arnd@arndb.de> 
Conflicts:
	arch/arm/mach-mxs/include/mach/common.h

Pull in previous samsung conflict merges and do a trivial
merge of an mxs double-add conflict.

Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Merge branch 'restart' into for-linus 2012-01-05T13:25:27+00:00 Russell King rmk+kernel@arm.linux.org.uk 2012-01-05T13:25:15+00:00 7b9dd47136c07ffd883aff6926c7b281e4c1eea4 Conflicts: arch/arm/mach-exynos/cpu.c The changes to arch/arm/mach-exynos/cpu.c were moved to mach-exynos/common.c. 
Conflicts:
	arch/arm/mach-exynos/cpu.c

The changes to arch/arm/mach-exynos/cpu.c were moved to
mach-exynos/common.c.
Merge branch 'devel-stable' into for-linus 2012-01-05T13:24:33+00:00 Russell King rmk+kernel@arm.linux.org.uk 2012-01-05T13:24:33+00:00 2e0e943436912ffe0848ece58167edfe754edb96 Conflicts: arch/arm/kernel/setup.c arch/arm/mach-shmobile/board-kota2.c 
Conflicts:
	arch/arm/kernel/setup.c
	arch/arm/mach-shmobile/board-kota2.c
ARM: restart: remove the now empty arch_reset() 2012-01-05T12:57:22+00:00 Russell King rmk+kernel@arm.linux.org.uk 2011-11-05T21:30:00+00:00 f88b8979d26615ce68772cebc85c3b556571afca Remove the now empty arch_reset() from all the mach/system.h includes, and remove its callsite. Remove arm_machine_restart() as this function no longer does anything useful. For samsung platforms, remove the include of mach/system-reset.h and plat/system-reset.h from their respective mach/system.h headers as these just define their arch_reset functions. As a result, the s3c2410 and plat-samsung system-reset.h files are no longer referenced, so remove these files entirely. Acked-by: Nicolas Pitre <nico@linaro.org> Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com> Acked-by: Jamie Iles <jamie@jamieiles.com> Acked-by: Tony Lindgren <tony@atomide.com> Acked-by: Linus Walleij <linus.walleij@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Remove the now empty arch_reset() from all the mach/system.h includes,
and remove its callsite.  Remove arm_machine_restart() as this function
no longer does anything useful.

For samsung platforms, remove the include of mach/system-reset.h and
plat/system-reset.h from their respective mach/system.h headers as these
just define their arch_reset functions.  As a result, the s3c2410 and
plat-samsung system-reset.h files are no longer referenced, so remove
these files entirely.

Acked-by: Nicolas Pitre <nico@linaro.org>
Acked-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Acked-by: Jamie Iles <jamie@jamieiles.com>
Acked-by: Tony Lindgren <tony@atomide.com>
Acked-by: Linus Walleij <linus.walleij@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
ARM: restart: mxs: use new restart hook 2012-01-05T12:57:15+00:00 Russell King rmk+kernel@arm.linux.org.uk 2011-11-05T15:43:30+00:00 6f91c5a46cf8f083e9316ce238d1aadb629f41dc Hook these platforms restart code into the new restart hook rather than using arch_reset(). Acked-by: Shawn Guo <shawn.guo@linaro.org> Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk> 
Hook these platforms restart code into the new restart hook rather
than using arch_reset().

Acked-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Russell King <rmk+kernel@arm.linux.org.uk>
Merge branch 'restart-cleanup' into restart 2012-01-05T12:56:44+00:00 Russell King rmk+kernel@arm.linux.org.uk 2012-01-05T12:56:44+00:00 4045407fd7740642b18bc802e8bab064e79a61e5 Conflicts: arch/arm/kernel/setup.c 
Conflicts:
	arch/arm/kernel/setup.c
ARM: mxs: select HAVE_CLK_PREPARE for clock 2011-12-28T13:35:08+00:00 Shawn Guo shawn.guo@linaro.org 2011-12-20T08:12:34+00:00 6abda3e129bfe4d74b5c274da7dff0e2b1488818 This patch adds clk_prepare/clk_unprepare for mxs clock api by renaming the existing non-atomic clk_enable/clk_disable to clk_prepare/clk_unprepare and adding a pair of dummy clk_enable/clk_disable. Then with selecting HAVE_CLK_PREPARE for mxs clock, we can fix the mutex locking warning that has been reported for a few times. Signed-off-by: Shawn Guo <shawn.guo@linaro.org> 
This patch adds clk_prepare/clk_unprepare for mxs clock api by
renaming the existing non-atomic clk_enable/clk_disable to
clk_prepare/clk_unprepare and adding a pair of dummy
clk_enable/clk_disable.  Then with selecting HAVE_CLK_PREPARE for
mxs clock, we can fix the mutex locking warning that has been
reported for a few times.

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
ARM: mxs: convert platform code to clk_prepare/clk_unprepare 2011-12-28T13:26:07+00:00 Shawn Guo shawn.guo@linaro.org 2011-12-20T05:50:11+00:00 ae68f7af05dbce25889ab10b302fba927dcdb295 The patch converts mxs platform code to clk_prepare/clk_unprepare by using helper functions clk_prepare_enable/clk_disable_unprepare. Signed-off-by: Richard Zhao <richard.zhao@linaro.org> Signed-off-by: Shawn Guo <shawn.guo@linaro.org> 
The patch converts mxs platform code to clk_prepare/clk_unprepare
by using helper functions clk_prepare_enable/clk_disable_unprepare.

Signed-off-by: Richard Zhao <richard.zhao@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Merge branch 'omap/hwmod' into next/drivers 2011-12-27T22:05:06+00:00 Arnd Bergmann arnd@arndb.de 2011-12-27T22:04:51+00:00 07b98403ee67838bbaded43bd687875b9d7f74e0 This is needed as a dependency for omap/ehci. Signed-off-by: Arnd Bergmann <arnd@arndb.de> 
This is needed as a dependency for omap/ehci.

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