power: reset: use restart_notifier mechanism for msm-poweroff

This change replaces use of arm_pm_restart with recently introduced
reset mechanism in Linux kernel called restart_notifier.

Choosing priority 128, which is default priority, as according to
documentation, this mechanism is sufficient to restart the entire system.

Cc: Guenter Roeck <linux@roeck-us.net>
Cc: Josh Cartwright <joshc@codeaurora.org>
Cc: Sebastian Reichel <sre@kernel.org>
Cc: Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
Cc: David Woodhouse <dwmw2@infradead.org>
Cc: Stephen Boyd <sboyd@codeaurora.org>
Cc: linux-pm@vger.kernel.org
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Reviewed-by: Stephen Boyd <sboyd@codeaurora.org>
Signed-off-by: Pramod Gurav <pramod.gurav@smartplayin.com>
Signed-off-by: Sebastian Reichel <sre@kernel.org>

diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c
index 774f9a3b310d686229ac5295bbc9a6ea34d4097c..4702efdfe466626f97f2b887868e47f611107d17 100644 (file)
--- a/drivers/power/reset/msm-poweroff.c
+++ b/drivers/power/reset/msm-poweroff.c
@@ -20,21 +20,27 @@
 #include <linux/platform_device.h>
 #include <linux/module.h>
 #include <linux/reboot.h>
-
-#include <asm/system_misc.h>
+#include <linux/pm.h>
 
 static void __iomem *msm_ps_hold;
-
-static void do_msm_restart(enum reboot_mode reboot_mode, const char *cmd)
+static int do_msm_restart(struct notifier_block *nb, unsigned long action,
+                          void *data)
 {
        writel(0, msm_ps_hold);
        mdelay(10000);
+
+       return NOTIFY_DONE;
 }
 
+static struct notifier_block restart_nb = {
+       .notifier_call = do_msm_restart,
+       .priority = 128,
+};
+
 static void do_msm_poweroff(void)
 {
        /* TODO: Add poweroff capability */
-       do_msm_restart(REBOOT_HARD, NULL);
+       do_msm_restart(&restart_nb, 0, NULL);
 }
 
 static int msm_restart_probe(struct platform_device *pdev)
@@ -47,8 +53,10 @@ static int msm_restart_probe(struct platform_device *pdev)
        if (IS_ERR(msm_ps_hold))
                return PTR_ERR(msm_ps_hold);
 
+       register_restart_handler(&restart_nb);
+
        pm_power_off = do_msm_poweroff;
-       arm_pm_restart = do_msm_restart;
+
        return 0;
 }