msm: restart: use new restart infrastructure
The hook for the restart function has been moved to the machine
descriptor, so clean this up for appropriate targets.
Change-Id: I00f289bd6af245378d2d5af4a583fa8b8b0bb371
Signed-off-by: Jeff Ohlstein <johlstei@codeaurora.org>
diff --git a/arch/arm/mach-msm/board-8064.c b/arch/arm/mach-msm/board-8064.c
index cdc6b5a..9f78ea7 100644
--- a/arch/arm/mach-msm/board-8064.c
+++ b/arch/arm/mach-msm/board-8064.c
@@ -70,6 +70,7 @@
#include <media/gpio-ir-recv.h>
#include <linux/fmem.h>
#include <mach/msm_pcie.h>
+#include <mach/restart.h>
#include "msm_watchdog.h"
#include "board-8064.h"
@@ -2990,6 +2991,7 @@
.handle_irq = gic_handle_irq,
.timer = &msm_timer,
.init_machine = apq8064_sim_init,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(APQ8064_RUMI3, "QCT APQ8064 RUMI3")
@@ -3000,6 +3002,7 @@
.timer = &msm_timer,
.init_machine = apq8064_rumi3_init,
.init_early = apq8064_allocate_memory_regions,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(APQ8064_CDP, "QCT APQ8064 CDP")
@@ -3011,6 +3014,7 @@
.init_machine = apq8064_cdp_init,
.init_early = apq8064_allocate_memory_regions,
.init_very_early = apq8064_early_reserve,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(APQ8064_MTP, "QCT APQ8064 MTP")
@@ -3022,6 +3026,7 @@
.init_machine = apq8064_cdp_init,
.init_early = apq8064_allocate_memory_regions,
.init_very_early = apq8064_early_reserve,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(APQ8064_LIQUID, "QCT APQ8064 LIQUID")
@@ -3033,6 +3038,7 @@
.init_machine = apq8064_cdp_init,
.init_early = apq8064_allocate_memory_regions,
.init_very_early = apq8064_early_reserve,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MPQ8064_CDP, "QCT MPQ8064 CDP")
@@ -3044,6 +3050,7 @@
.init_machine = apq8064_cdp_init,
.init_early = apq8064_allocate_memory_regions,
.init_very_early = apq8064_early_reserve,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MPQ8064_HRD, "QCT MPQ8064 HRD")
@@ -3055,6 +3062,7 @@
.init_machine = apq8064_cdp_init,
.init_early = apq8064_allocate_memory_regions,
.init_very_early = apq8064_early_reserve,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MPQ8064_DTV, "QCT MPQ8064 DTV")
@@ -3066,5 +3074,6 @@
.init_machine = apq8064_cdp_init,
.init_early = apq8064_allocate_memory_regions,
.init_very_early = apq8064_early_reserve,
+ .restart = msm_restart,
MACHINE_END
diff --git a/arch/arm/mach-msm/board-8930.c b/arch/arm/mach-msm/board-8930.c
index 5781e3ed2..f7e6801 100644
--- a/arch/arm/mach-msm/board-8930.c
+++ b/arch/arm/mach-msm/board-8930.c
@@ -2392,6 +2392,7 @@
.init_machine = msm8930_cdp_init,
.init_early = msm8930_allocate_memory_regions,
.init_very_early = msm8930_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8930_MTP, "QCT MSM8930 MTP")
@@ -2403,6 +2404,7 @@
.init_machine = msm8930_cdp_init,
.init_early = msm8930_allocate_memory_regions,
.init_very_early = msm8930_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8930_FLUID, "QCT MSM8930 FLUID")
@@ -2414,6 +2416,7 @@
.init_machine = msm8930_cdp_init,
.init_early = msm8930_allocate_memory_regions,
.init_very_early = msm8930_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8627_CDP, "QCT MSM8627 CDP")
@@ -2425,6 +2428,7 @@
.init_machine = msm8930_cdp_init,
.init_early = msm8930_allocate_memory_regions,
.init_very_early = msm8930_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8627_MTP, "QCT MSM8627 MTP")
@@ -2436,4 +2440,5 @@
.init_machine = msm8930_cdp_init,
.init_early = msm8930_allocate_memory_regions,
.init_very_early = msm8930_early_memory,
+ .restart = msm_restart,
MACHINE_END
diff --git a/arch/arm/mach-msm/board-8960.c b/arch/arm/mach-msm/board-8960.c
index 898332f..e0831fb 100644
--- a/arch/arm/mach-msm/board-8960.c
+++ b/arch/arm/mach-msm/board-8960.c
@@ -3100,6 +3100,7 @@
.init_machine = msm8960_sim_init,
.init_early = msm8960_allocate_memory_regions,
.init_very_early = msm8960_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8960_RUMI3, "QCT MSM8960 RUMI3")
@@ -3111,6 +3112,7 @@
.init_machine = msm8960_rumi3_init,
.init_early = msm8960_allocate_memory_regions,
.init_very_early = msm8960_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8960_CDP, "QCT MSM8960 CDP")
@@ -3122,6 +3124,7 @@
.init_machine = msm8960_cdp_init,
.init_early = msm8960_allocate_memory_regions,
.init_very_early = msm8960_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8960_MTP, "QCT MSM8960 MTP")
@@ -3133,6 +3136,7 @@
.init_machine = msm8960_cdp_init,
.init_early = msm8960_allocate_memory_regions,
.init_very_early = msm8960_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8960_FLUID, "QCT MSM8960 FLUID")
@@ -3144,6 +3148,7 @@
.init_machine = msm8960_cdp_init,
.init_early = msm8960_allocate_memory_regions,
.init_very_early = msm8960_early_memory,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8960_LIQUID, "QCT MSM8960 LIQUID")
@@ -3155,4 +3160,5 @@
.init_machine = msm8960_cdp_init,
.init_early = msm8960_allocate_memory_regions,
.init_very_early = msm8960_early_memory,
+ .restart = msm_restart,
MACHINE_END
diff --git a/arch/arm/mach-msm/board-9615.c b/arch/arm/mach-msm/board-9615.c
index d5a0857..df114a3 100644
--- a/arch/arm/mach-msm/board-9615.c
+++ b/arch/arm/mach-msm/board-9615.c
@@ -45,6 +45,7 @@
#include <mach/msm_memtypes.h>
#include <mach/cpuidle.h>
#include <mach/usb_bam.h>
+#include <mach/restart.h>
#include "timer.h"
#include "devices.h"
#include "board-9615.h"
@@ -1018,6 +1019,7 @@
#ifdef CONFIG_FB_MSM
.init_early = mdm9615_allocate_memory_regions,
#endif
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM9615_MTP, "QCT MSM9615 MTP")
@@ -1027,4 +1029,5 @@
.timer = &msm_timer,
.init_machine = msm9615_mtp_init,
.reserve = msm9615_reserve,
+ .restart = msm_restart,
MACHINE_END
diff --git a/arch/arm/mach-msm/board-fsm9xxx.c b/arch/arm/mach-msm/board-fsm9xxx.c
index 6b44087..6ad3cef 100644
--- a/arch/arm/mach-msm/board-fsm9xxx.c
+++ b/arch/arm/mach-msm/board-fsm9xxx.c
@@ -33,6 +33,7 @@
#include <mach/msm_iomap.h>
#include <mach/dma.h>
#include <mach/sirc.h>
+#include <mach/restart.h>
#include <mach/socinfo.h>
#include "devices.h"
@@ -923,4 +924,5 @@
.handle_irq = vic_handle_irq,
.init_machine = fsm9xxx_init,
.timer = &msm_timer,
+ .restart = fsm_restart,
MACHINE_END
diff --git a/arch/arm/mach-msm/board-msm8x60.c b/arch/arm/mach-msm/board-msm8x60.c
index efde720..57f2077 100644
--- a/arch/arm/mach-msm/board-msm8x60.c
+++ b/arch/arm/mach-msm/board-msm8x60.c
@@ -10558,6 +10558,7 @@
.init_machine = msm8x60_rumi3_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8X60_SIM, "QCT MSM8X60 SIMULATOR")
@@ -10568,6 +10569,7 @@
.init_machine = msm8x60_sim_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8X60_SURF, "QCT MSM8X60 SURF")
@@ -10578,6 +10580,7 @@
.init_machine = msm8x60_surf_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8X60_FFA, "QCT MSM8X60 FFA")
@@ -10588,6 +10591,7 @@
.init_machine = msm8x60_ffa_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8X60_FLUID, "QCT MSM8X60 FLUID")
@@ -10598,6 +10602,7 @@
.init_machine = msm8x60_fluid_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8X60_FUSION, "QCT MSM8X60 FUSION SURF")
@@ -10608,6 +10613,7 @@
.init_machine = msm8x60_charm_surf_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8X60_FUSN_FFA, "QCT MSM8X60 FUSION FFA")
@@ -10618,6 +10624,7 @@
.init_machine = msm8x60_charm_ffa_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
MACHINE_START(MSM8X60_DRAGON, "QCT MSM8X60 DRAGON")
@@ -10628,4 +10635,5 @@
.init_machine = msm8x60_dragon_init,
.timer = &msm_timer,
.init_early = msm8x60_charm_init_early,
+ .restart = msm_restart,
MACHINE_END
diff --git a/arch/arm/mach-msm/include/mach/restart.h b/arch/arm/mach-msm/include/mach/restart.h
index 84df9bc..b913e3f 100644
--- a/arch/arm/mach-msm/include/mach/restart.h
+++ b/arch/arm/mach-msm/include/mach/restart.h
@@ -17,8 +17,11 @@
#define RESTART_NORMAL 0x0
#define RESTART_DLOAD 0x1
-#ifdef CONFIG_MSM_NATIVE_RESTART
+#if defined(CONFIG_MSM_NATIVE_RESTART)
void msm_set_restart_mode(int mode);
+void msm_restart(char mode, const char *cmd);
+#elif defined(CONFIG_ARCH_FSM9XXX)
+void fsm_restart(char mode, const char *cmd);
#else
#define msm_set_restart_mode(mode)
#endif
diff --git a/arch/arm/mach-msm/restart-fsm9xxx.c b/arch/arm/mach-msm/restart-fsm9xxx.c
index 2bfefb2..4c5892f 100644
--- a/arch/arm/mach-msm/restart-fsm9xxx.c
+++ b/arch/arm/mach-msm/restart-fsm9xxx.c
@@ -22,7 +22,7 @@
#define FEMTO_GPIO_PS_HOLD 161
-void arch_reset(char mode, const char *cmd)
+void fsm_restart(char mode, const char *cmd)
{
pr_notice("Going down for restart now\n");
msleep(3000);
diff --git a/arch/arm/mach-msm/restart.c b/arch/arm/mach-msm/restart.c
index e45e2c4..7288c1d 100644
--- a/arch/arm/mach-msm/restart.c
+++ b/arch/arm/mach-msm/restart.c
@@ -177,7 +177,7 @@
return IRQ_HANDLED;
}
-void arch_reset(char mode, const char *cmd)
+void msm_restart(char mode, const char *cmd)
{
#ifdef CONFIG_MSM_DLOAD_MODE