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>

diff --git a/arch/arm/mach-imx/common.h b/arch/arm/mach-imx/common.h
index 1dabf43..a6147f9 100644 (file)
--- a/arch/arm/mach-imx/common.h
+++ b/arch/arm/mach-imx/common.h
@@ -61,7 +61,6 @@ struct platform_device *mxc_register_gpio(char *name, int id,
 void mxc_set_cpu_type(unsigned int type);
 void mxc_restart(enum reboot_mode, const char *);
 void mxc_arch_reset_init(void __iomem *);
-void mxc_arch_reset_init_dt(void);
 int mx51_revision(void);
 int mx53_revision(void);
 void imx_set_aips(void __iomem *);

diff --git a/arch/arm/mach-imx/imx25-dt.c b/arch/arm/mach-imx/imx25-dt.c
index cf8032b..25defbd 100644 (file)
--- a/arch/arm/mach-imx/imx25-dt.c
+++ b/arch/arm/mach-imx/imx25-dt.c
@@ -17,13 +17,6 @@
 #include "common.h"
 #include "mx25.h"
 
-static void __init imx25_dt_init(void)
-{
-       mxc_arch_reset_init_dt();
-
-       of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
-}
-
 static const char * const imx25_dt_board_compat[] __initconst = {
        "fsl,imx25",
        NULL
@@ -33,7 +26,5 @@ DT_MACHINE_START(IMX25_DT, "Freescale i.MX25 (Device Tree Support)")
        .map_io         = mx25_map_io,
        .init_early     = imx25_init_early,
        .init_irq       = mx25_init_irq,
-       .init_machine   = imx25_dt_init,
        .dt_compat      = imx25_dt_board_compat,
-       .restart        = mxc_restart,
 MACHINE_END

diff --git a/arch/arm/mach-imx/imx27-dt.c b/arch/arm/mach-imx/imx27-dt.c
index dc8f1a6..bd42d1b 100644 (file)
--- a/arch/arm/mach-imx/imx27-dt.c
+++ b/arch/arm/mach-imx/imx27-dt.c
@@ -22,8 +22,6 @@ static void __init imx27_dt_init(void)
 {
        struct platform_device_info devinfo = { .name = "cpufreq-dt", };
 
-       mxc_arch_reset_init_dt();
-
        of_platform_populate(NULL, of_default_bus_match_table, NULL, NULL);
 
        platform_device_register_full(&devinfo);
@@ -40,5 +38,4 @@ DT_MACHINE_START(IMX27_DT, "Freescale i.MX27 (Device Tree Support)")
        .init_irq       = mx27_init_irq,
        .init_machine   = imx27_dt_init,
        .dt_compat      = imx27_dt_board_compat,
-       .restart        = mxc_restart,
 MACHINE_END

diff --cc arch/arm/mach-imx/imx31-dt.c
Simple merge

diff --cc arch/arm/mach-imx/imx35-dt.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx50.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx51.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx53.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6q.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6sl.c
Simple merge

diff --cc arch/arm/mach-imx/mach-imx6sx.c
Simple merge

diff --cc arch/arm/mach-imx/mach-vf610.c
Simple merge

diff --cc arch/arm/mach-imx/system.c
Simple merge