mirrors/linux-stable
1
0
Fork 0
mirror of https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git synced 2024-10-07 09:09:23 +00:00
Code Issues Releases Wiki Activity

power/reset: axxia: Register with kernel restart handler

Browse source 
Register with kernel restart handler instead of setting arm_pm_restart
directly.

Cc: Anders Berg <anders.berg@lsi.com>
Tested-by: Anders Berg <anders.berg@avagotech.com>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2014-09-30 10:48:33 -07:00 committed by Sebastian Reichel
parent 8f57f2310f
commit fcf01c51f0
1 changed files with 15 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
drivers/power/reset/axxia-reset.c
View file

@ -19,14 +19,12 @@
#include <linux/kernel.h> #include <linux/kernel.h>
#include <linux/mfd/syscon.h> #include <linux/mfd/syscon.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/notifier.h>
#include <linux/of.h> #include <linux/of.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <linux/regmap.h> #include <linux/regmap.h>
#include <asm/system_misc.h>
#define SC_CRIT_WRITE_KEY 0x1000 #define SC_CRIT_WRITE_KEY 0x1000
#define SC_LATCH_ON_RESET 0x1004 #define SC_LATCH_ON_RESET 0x1004
#define SC_RESET_CONTROL 0x1008 #define SC_RESET_CONTROL 0x1008
@ -39,7 +37,8 @@
static struct regmap *syscon; static struct regmap *syscon;
static void do_axxia_restart(enum reboot_mode reboot_mode, const char *cmd) static int axxia_restart_handler(struct notifier_block *this,
unsigned long mode, void *cmd)
{ {
/* Access Key (0xab) */ /* Access Key (0xab) */
regmap_write(syscon, SC_CRIT_WRITE_KEY, 0xab); regmap_write(syscon, SC_CRIT_WRITE_KEY, 0xab);
@ -50,11 +49,19 @@ static void do_axxia_restart(enum reboot_mode reboot_mode, const char *cmd)
/* Assert chip reset */ /* Assert chip reset */
regmap_update_bits(syscon, SC_RESET_CONTROL, regmap_update_bits(syscon, SC_RESET_CONTROL,
RSTCTL_RST_CHIP, RSTCTL_RST_CHIP); RSTCTL_RST_CHIP, RSTCTL_RST_CHIP);
return NOTIFY_DONE;
} }
static struct notifier_block axxia_restart_nb = {
.notifier_call = axxia_restart_handler,
.priority = 128,
};
static int axxia_reset_probe(struct platform_device *pdev) static int axxia_reset_probe(struct platform_device *pdev)
{ {
struct device *dev = &pdev->dev; struct device *dev = &pdev->dev;
int err;
syscon = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon"); syscon = syscon_regmap_lookup_by_phandle(dev->of_node, "syscon");
if (IS_ERR(syscon)) { if (IS_ERR(syscon)) {
@ -62,9 +69,11 @@ static int axxia_reset_probe(struct platform_device *pdev)
return PTR_ERR(syscon); return PTR_ERR(syscon);
} }
arm_pm_restart = do_axxia_restart; err = register_restart_handler(&axxia_restart_nb);
if (err)
dev_err(dev, "cannot register restart handler (err=%d)\n", err);
return 0; return err;
} }
static const struct of_device_id of_axxia_reset_match[] = { static const struct of_device_id of_axxia_reset_match[] = {