]> git.karo-electronics.de Git - karo-tx-linux.git/commit
ARM: imx: move clk_prepare() out from mxc_restart()
authorShawn Guo <shawn.guo@linaro.org>
Fri, 10 May 2013 01:13:44 +0000 (09:13 +0800)
committerJason Liu <r64343@freescale.com>
Wed, 30 Oct 2013 01:53:36 +0000 (09:53 +0800)
commit56cd6b27e81c651a679b3bb8e09f73e01b3f53d8
tree257be3ab7a8d18fbebdce387d1bc526e6c4a76ff
parentcc83b571b50d7474e2b7323409f359b8d1ce2ec9
ARM: imx: move clk_prepare() out from mxc_restart()

Commit 18cb680f1a003a1a1ec0e6097d7b763516a27f04 upstream.

It's inappropriate to call clk_prepare() in mxc_restart(), because the
restart routine could be called in atomic context.  Move clk_get() and
clk_prepare() into mxc_arch_reset_init() and only have the atomic part
clk_enable() be called in mxc_restart().

As a result, mxc_arch_reset_init() needs to be called after clk gets
initialized.

While there, it also changes printk(KERN_ERR ...) to pr_err() and adds
__init annotation for mxc_arch_reset_init().

Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Signed-off-by: Shawn Guo <shawn.guo@freescale.com>
12 files changed:
arch/arm/mach-imx/imx25-dt.c
arch/arm/mach-imx/imx27-dt.c
arch/arm/mach-imx/imx31-dt.c
arch/arm/mach-imx/imx51-dt.c
arch/arm/mach-imx/mach-imx53.c
arch/arm/mach-imx/mm-imx1.c
arch/arm/mach-imx/mm-imx21.c
arch/arm/mach-imx/mm-imx25.c
arch/arm/mach-imx/mm-imx27.c
arch/arm/mach-imx/mm-imx3.c
arch/arm/mach-imx/mm-imx5.c
arch/arm/mach-imx/system.c