From: Shawn Guo <shawn.guo@linaro.org>
Date: Fri, 10 May 2013 01:13:44 +0000 (+0800)
Subject: ARM: imx: move clk_prepare() out from mxc_restart()
X-Git-Tag: omap-for-v3.11/fixes-for-merge-window~69^2~10^2~24
X-Git-Url: http://git.openpandora.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=18cb680f1a003a1a1ec0e6097d7b763516a27f04;p=pandora-kernel.git

ARM: imx: move clk_prepare() out from mxc_restart()

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>
---

Reading git-diff-tree failed