diff options
author | Jingchang Lu <jingchang.lu@freescale.com> | 2014-10-31 17:39:53 +0800 |
---|---|---|
committer | Shawn Guo <shawn.guo@linaro.org> | 2014-11-22 07:39:36 +0800 |
commit | 08ae9646468c636098f689a72194778b15c9d94a (patch) | |
tree | 1a7318b7a4c73061f86cea07f7ccfb28857037fb /arch/arm/mach-imx/mach-vf610.c | |
parent | f144c7ec0dfe2f53c3c57538560a11bdc94d0cd1 (diff) | |
download | blackbird-op-linux-08ae9646468c636098f689a72194778b15c9d94a.tar.gz blackbird-op-linux-08ae9646468c636098f689a72194778b15c9d94a.zip |
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-vf610.c')
-rw-r--r-- | arch/arm/mach-imx/mach-vf610.c | 10 |
1 files changed, 0 insertions, 10 deletions
diff --git a/arch/arm/mach-imx/mach-vf610.c b/arch/arm/mach-imx/mach-vf610.c index ee7e57b752a7..c11ab6a1dc87 100644 --- a/arch/arm/mach-imx/mach-vf610.c +++ b/arch/arm/mach-imx/mach-vf610.c @@ -12,14 +12,6 @@ #include <asm/mach/arch.h> #include <asm/hardware/cache-l2x0.h> -#include "common.h" - -static void __init vf610_init_machine(void) -{ - mxc_arch_reset_init_dt(); - of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL); -} - static const char * const vf610_dt_compat[] __initconst = { "fsl,vf610", NULL, @@ -28,7 +20,5 @@ static const char * const vf610_dt_compat[] __initconst = { DT_MACHINE_START(VYBRID_VF610, "Freescale Vybrid VF610 (Device Tree)") .l2c_aux_val = 0, .l2c_aux_mask = ~0, - .init_machine = vf610_init_machine, .dt_compat = vf610_dt_compat, - .restart = mxc_restart, MACHINE_END |