This change uses replaces use of arm_pm_restart with recently introduced reset mechanism in Linux kernel called restart_notifier. Cc: Guenter Roeck <linux@xxxxxxxxxxxx> Cc: Josh Cartwright <joshc@xxxxxxxxxxxxxx> Cc: Sebastian Reichel <sre@xxxxxxxxxx> Cc: Dmitry Eremin-Solenikov <dbaryshkov@xxxxxxxxx> Cc: David Woodhouse <dwmw2@xxxxxxxxxxxxx> Cc: Stephen Boyd <sboyd@xxxxxxxxxxxxxx> Cc: linux-pm@xxxxxxxxxxxxxxx Signed-off-by: Pramod Gurav <pramod.gurav@xxxxxxxxxxxxxxx> --- This patch is tested on DB8074 Target and are based on patchset [1] by Guenter Roeck. [1]: https://patchwork.kernel.org/patch/4746721/ drivers/power/reset/msm-poweroff.c | 18 +++++++++++++++--- 1 file changed, 15 insertions(+), 3 deletions(-) diff --git a/drivers/power/reset/msm-poweroff.c b/drivers/power/reset/msm-poweroff.c index 774f9a3..59b368c 100644 --- a/drivers/power/reset/msm-poweroff.c +++ b/drivers/power/reset/msm-poweroff.c @@ -24,17 +24,21 @@ #include <asm/system_misc.h> static void __iomem *msm_ps_hold; +static struct notifier_block restart_nb; -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 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 +51,16 @@ static int msm_restart_probe(struct platform_device *pdev) if (IS_ERR(msm_ps_hold)) return PTR_ERR(msm_ps_hold); + restart_nb.notifier_call = do_msm_restart; + restart_nb.priority = 128; + if (register_restart_handler(&restart_nb)) { + dev_err(&pdev->dev, + "failed to setup restart handler.\n"); + restart_nb.notifier_call = NULL; + } + pm_power_off = do_msm_poweroff; - arm_pm_restart = do_msm_restart; + return 0; } -- 1.7.9.5 -- To unsubscribe from this list: send the line "unsubscribe linux-arm-msm" in the body of a message to majordomo@xxxxxxxxxxxxxxx More majordomo info at http://vger.kernel.org/majordomo-info.html
