summaryrefslogtreecommitdiff
path: root/arch/arm/mach-imx/mach-imx6sx.c
diff options
context:
space:
mode:
authorJingchang Lu <jingchang.lu@freescale.com>2014-10-31 17:39:53 +0800
committerShawn Guo <shawn.guo@linaro.org>2014-11-22 07:39:36 +0800
commit08ae9646468c636098f689a72194778b15c9d94a (patch)
tree1a7318b7a4c73061f86cea07f7ccfb28857037fb /arch/arm/mach-imx/mach-imx6sx.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/mach-imx6sx.c')
-rw-r--r--arch/arm/mach-imx/mach-imx6sx.c3
1 files changed, 0 insertions, 3 deletions
diff --git a/arch/arm/mach-imx/mach-imx6sx.c b/arch/arm/mach-imx/mach-imx6sx.c
index 3de3b7369aef..ccee19cf825d 100644
--- a/arch/arm/mach-imx/mach-imx6sx.c
+++ b/arch/arm/mach-imx/mach-imx6sx.c
@@ -18,8 +18,6 @@ static void __init imx6sx_init_machine(void)
{
struct device *parent;
- mxc_arch_reset_init_dt();
-
parent = imx_soc_device_init();
if (parent == NULL)
pr_warn("failed to initialize soc device\n");
@@ -58,5 +56,4 @@ DT_MACHINE_START(IMX6SX, "Freescale i.MX6 SoloX (Device Tree)")
.init_machine = imx6sx_init_machine,
.dt_compat = imx6sx_dt_compat,
.init_late = imx6sx_init_late,
- .restart = mxc_restart,
MACHINE_END