diff options
| author | Guenter Roeck <linux@roeck-us.net> | 2015-01-25 21:30:40 +0100 |
|---|---|---|
| committer | Sebastian Reichel <sre@kernel.org> | 2015-01-25 22:12:45 +0100 |
| commit | 25a5b57dd76fbcbcb4107aa95400862cb924470d (patch) | |
| tree | 3cc34c636362f41884c97cc120183e8bdbf332b0 | |
| parent | power: test_power: Use enum as index for array of supplies (diff) | |
| download | linux-25a5b57dd76fbcbcb4107aa95400862cb924470d.tar.xz linux-25a5b57dd76fbcbcb4107aa95400862cb924470d.zip | |
power/reset: arm-versatile: Register with kernel restart handler
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>
| -rw-r--r-- | drivers/power/reset/arm-versatile-reboot.c | 17 |
1 files changed, 14 insertions, 3 deletions
diff --git a/drivers/power/reset/arm-versatile-reboot.c b/drivers/power/reset/arm-versatile-reboot.c index adea9d0c38e0..b208073c887d 100644 --- a/drivers/power/reset/arm-versatile-reboot.c +++ b/drivers/power/reset/arm-versatile-reboot.c @@ -13,7 +13,6 @@ #include <linux/reboot.h> #include <linux/regmap.h> #include <linux/of.h> -#include <asm/system_misc.h> #define INTEGRATOR_HDR_CTRL_OFFSET 0x0C #define INTEGRATOR_HDR_LOCK_OFFSET 0x14 @@ -69,7 +68,8 @@ static const struct of_device_id versatile_reboot_of_match[] = { {}, }; -static void versatile_reboot(enum reboot_mode mode, const char *cmd) +static int versatile_reboot(struct notifier_block *this, unsigned long mode, + void *cmd) { /* Unlock the reset register */ /* Then hit reset on the different machines */ @@ -113,12 +113,20 @@ static void versatile_reboot(enum reboot_mode mode, const char *cmd) break; } dsb(); + + return NOTIFY_DONE; } +static struct notifier_block versatile_reboot_nb = { + .notifier_call = versatile_reboot, + .priority = 192, +}; + static int __init versatile_reboot_probe(void) { const struct of_device_id *reboot_id; struct device_node *np; + int err; np = of_find_matching_node_and_match(NULL, versatile_reboot_of_match, &reboot_id); @@ -130,7 +138,10 @@ static int __init versatile_reboot_probe(void) if (IS_ERR(syscon_regmap)) return PTR_ERR(syscon_regmap); - arm_pm_restart = versatile_reboot; + err = register_restart_handler(&versatile_reboot_nb); + if (err) + return err; + pr_info("versatile reboot driver registered\n"); return 0; } |