aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx31-dt.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-05-10 10:19:01 +0800
committerShawn Guo <shawn.guo@linaro.org>2013-06-17 15:45:10 +0800
commitc1e31d126b4db6a3a8d96883fae40fe22d5eba65 (patch)
tree88dc2c60a53d0f6ad84545de3975f43b6b7b7b51 /arch/arm/mach-imx/imx31-dt.c
parentARM: imx: move clk_prepare() out from mxc_restart() (diff)
downloadlinux-dev-c1e31d126b4db6a3a8d96883fae40fe22d5eba65.tar.xz
linux-dev-c1e31d126b4db6a3a8d96883fae40fe22d5eba65.zip
ARM: imx: create mxc_arch_reset_init_dt() for DT boot
The mxc_arch_reset_init() uses static mapping and calls clk_get_sys() to get clock. It's suitable for non-DT boot but not for DT boot where dynamic mapping and of_clk_get() should be used instead. Create mxc_arch_reset_init_dt() as the DT variant of mxc_arch_reset_init(), and change DT platforms to use it. 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, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx31-dt.c b/arch/arm/mach-imx/imx31-dt.c
index d8b3b22aeba7..818a1cc2fe45 100644
--- a/arch/arm/mach-imx/imx31-dt.c
+++ b/arch/arm/mach-imx/imx31-dt.c
@@ -16,12 +16,11 @@
#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));
+ mxc_arch_reset_init_dt();
of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
}