Skip to content

Commit

Permalink
power/reset: st-poweroff: Register with kernel restart handler
Browse files Browse the repository at this point in the history
Register with kernel restart handler instead of setting arm_pm_restart
directly. Select high priority since the restart handler is instantiated
through devicetree, indicating that it should be used if configured.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Sebastian Reichel <sre@kernel.org>
  • Loading branch information
Guenter Roeck authored and Sebastian Reichel committed Jan 25, 2015
1 parent b2b3a8b commit 453fe4f
Showing 1 changed file with 11 additions and 6 deletions.
17 changes: 11 additions & 6 deletions drivers/power/reset/st-poweroff.c
Original file line number Diff line number Diff line change
Expand Up @@ -15,10 +15,9 @@
#include <linux/of_platform.h>
#include <linux/platform_device.h>
#include <linux/mfd/syscon.h>
#include <linux/reboot.h>
#include <linux/regmap.h>

#include <asm/system_misc.h>

struct reset_syscfg {
struct regmap *regmap;
/* syscfg used for reset */
Expand Down Expand Up @@ -75,7 +74,8 @@ static struct reset_syscfg stid127_reset = {

static struct reset_syscfg *st_restart_syscfg;

static void st_restart(enum reboot_mode reboot_mode, const char *cmd)
static int st_restart(struct notifier_block *this, unsigned long mode,
void *cmd)
{
/* reset syscfg updated */
regmap_update_bits(st_restart_syscfg->regmap,
Expand All @@ -88,8 +88,15 @@ static void st_restart(enum reboot_mode reboot_mode, const char *cmd)
st_restart_syscfg->offset_rst_msk,
st_restart_syscfg->mask_rst_msk,
0);

return NOTIFY_DONE;
}

static struct notifier_block st_restart_nb = {
.notifier_call = st_restart,
.priority = 192,
};

static struct of_device_id st_reset_of_match[] = {
{
.compatible = "st,stih415-restart",
Expand Down Expand Up @@ -126,9 +133,7 @@ static int st_reset_probe(struct platform_device *pdev)
return PTR_ERR(st_restart_syscfg->regmap);
}

arm_pm_restart = st_restart;

return 0;
return register_restart_handler(&st_restart_nb);
}

static struct platform_driver st_reset_driver = {
Expand Down

0 comments on commit 453fe4f

Please sign in to comment.