From: Guenter Roeck <linux@roeck-us.net>
To: Sebastian Reichel <sre@kernel.org>
Cc: linux-pm@vger.kernel.org,
Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>,
David Woodhouse <dwmw2@infradead.org>,
Santosh Shilimkar <santosh.shilimkar@ti.com>,
linux-kernel@vger.kernel.org, Guenter Roeck <linux@roeck-us.net>,
Haojian Zhuang <haojian.zhuang@linaro.org>
Subject: [PATCH 09/10] power/reset: hisi: Register with kernel restart handler
Date: Fri, 26 Sep 2014 17:57:17 -0700 [thread overview]
Message-ID: <1411779438-23127-10-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1411779438-23127-1-git-send-email-linux@roeck-us.net>
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>
---
drivers/power/reset/hisi-reboot.c | 18 +++++++++++++++---
1 file changed, 15 insertions(+), 3 deletions(-)
diff --git a/drivers/power/reset/hisi-reboot.c b/drivers/power/reset/hisi-reboot.c
index 0c91d02..e9774b0 100644
--- a/drivers/power/reset/hisi-reboot.c
+++ b/drivers/power/reset/hisi-reboot.c
@@ -14,27 +14,36 @@
#include <linux/delay.h>
#include <linux/io.h>
#include <linux/module.h>
+#include <linux/notifier.h>
#include <linux/of_address.h>
#include <linux/platform_device.h>
#include <linux/reboot.h>
#include <asm/proc-fns.h>
-#include <asm/system_misc.h>
static void __iomem *base;
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);
while (1)
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)
{
struct device_node *np = pdev->dev.of_node;
+ int err;
base = of_iomap(np, 0);
if (!base) {
@@ -47,7 +56,10 @@ static int hisi_reboot_probe(struct platform_device *pdev)
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;
}
--
1.9.1
next prev parent reply other threads:[~2014-09-27 0:57 UTC|newest]
Thread overview: 15+ messages / expand[flat|nested] mbox.gz Atom feed top
2014-09-27 0:57 [PATCH 00/10] power/reset: Register drivers with restart handler Guenter Roeck
2014-09-27 0:57 ` [PATCH 01/10] power/reset: vexpress: Register with kernel " Guenter Roeck
2014-09-27 0:57 ` [PATCH 02/10] power/reset: xgene: Return -ENOMEM if out of memory Guenter Roeck
2014-09-27 0:57 ` [PATCH 03/10] power/reset: xgene: Drop devm_kfree Guenter Roeck
2014-09-27 0:57 ` [PATCH 04/10] power/reset: xgene: Use local variable dev instead of pdev->dev Guenter Roeck
2014-09-27 0:57 ` [PATCH 05/10] power/reset: xgene: Use mdelay instead of jiffies based timeout Guenter Roeck
2014-09-27 0:57 ` [PATCH 06/10] power/reset: xgene: Register with kernel restart handler Guenter Roeck
2014-09-27 0:57 ` [PATCH 07/10] power/reset: axxia: " Guenter Roeck
2014-09-29 8:40 ` Anders Berg
2014-09-27 0:57 ` [PATCH 08/10] power/reset: keystone: " Guenter Roeck
2014-09-28 22:57 ` Santosh Shilimkar
2014-09-29 13:53 ` Ivan Khoronzhuk
2014-09-29 15:11 ` Guenter Roeck
2014-09-27 0:57 ` Guenter Roeck [this message]
2014-09-27 0:57 ` [PATCH 10/10] power/reset: brcmstb: " Guenter Roeck
Reply instructions:
You may reply publicly to this message via plain-text email
using any one of the following methods:
* Save the following mbox file, import it into your mail client,
and reply-to-all from there: mbox
Avoid top-posting and favor interleaved quoting:
https://en.wikipedia.org/wiki/Posting_style#Interleaved_style
* Reply using the --to, --cc, and --in-reply-to
switches of git-send-email(1):
git send-email \
--in-reply-to=1411779438-23127-10-git-send-email-linux@roeck-us.net \
--to=linux@roeck-us.net \
--cc=dbaryshkov@gmail.com \
--cc=dwmw2@infradead.org \
--cc=haojian.zhuang@linaro.org \
--cc=linux-kernel@vger.kernel.org \
--cc=linux-pm@vger.kernel.org \
--cc=santosh.shilimkar@ti.com \
--cc=sre@kernel.org \
/path/to/YOUR_REPLY
https://kernel.org/pub/software/scm/git/docs/git-send-email.html
* If your mail client supports setting the In-Reply-To header
via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line
before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).