aboutsummaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-imx/system.c
diff options
context:
space:
mode:
authorJingchang Lu <jingchang.lu@freescale.com>2014-10-31 05:39:53 -0400
committerShawn Guo <shawn.guo@linaro.org>2014-11-21 18:39:36 -0500
commit08ae9646468c636098f689a72194778b15c9d94a (patch)
tree1a7318b7a4c73061f86cea07f7ccfb28857037fb /arch/arm/mach-imx/system.c
parentf144c7ec0dfe2f53c3c57538560a11bdc94d0cd1 (diff)
ARM: imx: clean up machine mxc_arch_reset_init_dt reset init
System restart mechanism has been changed with the introduction of "kernel restart handler call chain support". The imx2 watchdog based restart handler has been moved to the driver, and these restart can be removed from the machine layer. This patch cleans up the device tree version machine reset init with mxc_arch_reset_init_dt and removes corresponding .restart handler, for the .init_machine that can be handled by system default after removing the mxc_arch_reset_init_dt, the .init_machine is also removed. Signed-off-by: Jingchang Lu <jingchang.lu@freescale.com> Signed-off-by: Shawn Guo <shawn.guo@linaro.org>
Diffstat (limited to 'arch/arm/mach-imx/system.c')
-rw-r--r--arch/arm/mach-imx/system.c15
1 files changed, 0 insertions, 15 deletions
diff --git a/arch/arm/mach-imx/system.c b/arch/arm/mach-imx/system.c
index d14c33fd6b03..51c35013b673 100644
--- a/arch/arm/mach-imx/system.c
+++ b/arch/arm/mach-imx/system.c
@@ -89,21 +89,6 @@ void __init mxc_arch_reset_init(void __iomem *base)
89 clk_prepare(wdog_clk); 89 clk_prepare(wdog_clk);
90} 90}
91 91
92void __init mxc_arch_reset_init_dt(void)
93{
94 struct device_node *np;
95
96 np = of_find_compatible_node(NULL, NULL, "fsl,imx21-wdt");
97 wdog_base = of_iomap(np, 0);
98 WARN_ON(!wdog_base);
99
100 wdog_clk = of_clk_get(np, 0);
101 if (IS_ERR(wdog_clk))
102 pr_warn("%s: failed to get wdog clock\n", __func__);
103 else
104 clk_prepare(wdog_clk);
105}
106
107#ifdef CONFIG_CACHE_L2X0 92#ifdef CONFIG_CACHE_L2X0
108void __init imx_init_l2cache(void) 93void __init imx_init_l2cache(void)
109{ 94{