evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

power/reset: hisi: Register with kernel restart handler

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

Cc: Haojian Zhuang <haojian.zhuang@linaro.org>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
This commit is contained in:
Guenter Roeck 2014-09-30 10:48:35 -07:00 • committed by Sebastian Reichel
parent f59a42d4e1
commit 6724534c79
1 changed files with 16 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

20
drivers/power/reset/hisi-reboot.c
View file

@ -14,27 +14,36 @@
#include <linux/delay.h> #include <linux/delay.h>
#include <linux/io.h> #include <linux/io.h>
#include <linux/module.h> #include <linux/module.h>
#include <linux/notifier.h>
#include <linux/of_address.h> #include <linux/of_address.h>
#include <linux/platform_device.h> #include <linux/platform_device.h>
#include <linux/reboot.h> #include <linux/reboot.h>
#include <asm/proc-fns.h> #include <asm/proc-fns.h>
#include <asm/system_misc.h>
static void __iomem *base; static void __iomem *base;
static u32 reboot_offset; static u32 reboot_offset;
static void hisi_restart(enum reboot_mode mode, const char *cmd) static int hisi_restart_handler(struct notifier_block *this,
unsigned long mode, void *cmd)
{ {
writel_relaxed(0xdeadbeef, base + reboot_offset); writel_relaxed(0xdeadbeef, base + reboot_offset);
while (1) while (1)
cpu_do_idle(); cpu_do_idle();
return NOTIFY_DONE;
} }
static struct notifier_block hisi_restart_nb = {
.notifier_call = hisi_restart_handler,
.priority = 128,
};
static int hisi_reboot_probe(struct platform_device *pdev) static int hisi_reboot_probe(struct platform_device *pdev)
{ {
struct device_node *np = pdev->dev.of_node; struct device_node *np = pdev->dev.of_node;
int err;
base = of_iomap(np, 0); base = of_iomap(np, 0);
if (!base) { if (!base) {
@ -47,9 +56,12 @@ static int hisi_reboot_probe(struct platform_device *pdev)
return -EINVAL; return -EINVAL;
} }
arm_pm_restart = hisi_restart; err = register_restart_handler(&hisi_restart_nb);
if (err)
dev_err(&pdev->dev, "cannot register restart handler (err=%d)\n",
err);
return 0; return err;
} }
static struct of_device_id hisi_reboot_of_match[] = { static struct of_device_id hisi_reboot_of_match[] = {