aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/imx25-dt.c
diff options
context:
space:
mode:
authorShawn Guo <shawn.guo@linaro.org>2013-05-09 22:19:01 -0400
committerShawn Guo <shawn.guo@linaro.org>2013-06-17 03:45:10 -0400
commitc1e31d126b4db6a3a8d96883fae40fe22d5eba65 (patch)
tree88dc2c60a53d0f6ad84545de3975f43b6b7b7b51 /arch/arm/mach-imx/imx25-dt.c
parent18cb680f1a003a1a1ec0e6097d7b763516a27f04 (diff)
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/imx25-dt.c')
-rw-r--r--arch/arm/mach-imx/imx25-dt.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/imx25-dt.c
index ec339917fbf4..3e1ec5ffe630 100644
--- a/arch/arm/mach-imx/imx25-dt.c
+++ b/arch/arm/mach-imx/imx25-dt.c
@@ -15,12 +15,11 @@
15#include <asm/mach/arch.h> 15#include <asm/mach/arch.h>
16#include <asm/mach/time.h> 16#include <asm/mach/time.h>
17#include "common.h" 17#include "common.h"
18#include "hardware.h"
19#include "mx25.h" 18#include "mx25.h"
20 19
21static void __init imx25_dt_init(void) 20static void __init imx25_dt_init(void)
22{ 21{
23 mxc_arch_reset_init(MX25_IO_ADDRESS(MX25_WDOG_BASE_ADDR)); 22 mxc_arch_reset_init_dt();
24 23
25 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); 24 of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
26} 25}