summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx31-dt.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-05-10 09:13:44 +0800
committerShawn Guo <shawn.guo@linaro.org>2013-06-17 15:45:10 +0800
commit18cb680f1a003a1a1ec0e6097d7b763516a27f04 (patch)
treef9ef6d5b1fe540a4bb070fcbd1a222c11458afb1 /arch/arm/mach-imx/imx31-dt.c
parent24a83fe4b039ef3779efd6b1fc88ee020e8af52f (diff)
downloadop-kernel-dev-18cb680f1a003a1a1ec0e6097d7b763516a27f04.zip
op-kernel-dev-18cb680f1a003a1a1ec0e6097d7b763516a27f04.tar.gz
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>
Diffstat (limited to 'arch/arm/mach-imx/imx31-dt.c')
-rw-r--r--arch/arm/mach-imx/imx31-dt.c3
1 files changed, 3 insertions, 0 deletions
diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c
index 67de611..d8b3b22 100644
--- a/arch/arm/mach-imx/imx31-dt.c
+++ b/arch/arm/mach-imx/imx31-dt.c
@@ -16,10 +16,13 @@
#include <asm/mach/time.h>
#include "common.h"
+#include "hardware.h"
#include "mx31.h"
static void __init imx31_dt_init(void)
{
+ mxc_arch_reset_init(MX31_IO_ADDRESS(MX31_WDOG_BASE_ADDR));
+
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}
OpenPOWER on IntegriCloud