linux-arm-kernel.lists.infradead.org archive mirror
 help / color / mirror / Atom feed
From: linux@roeck-us.net (Guenter Roeck)
To: linux-arm-kernel@lists.infradead.org
Subject: [PATCH v7 11/11] clk: rockchip: add restart handler
Date: Tue, 19 Aug 2014 17:45:38 -0700	[thread overview]
Message-ID: <1408495538-27480-12-git-send-email-linux@roeck-us.net> (raw)
In-Reply-To: <1408495538-27480-1-git-send-email-linux@roeck-us.net>

From: Heiko St?bner <heiko@sntech.de>

Add infrastructure to write the correct value to the restart register and
register the restart notifier for both rk3188 (including rk3066) and rk3288.

Signed-off-by: Heiko Stuebner <heiko@sntech.de>
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
v7: Added patch to series.

 drivers/clk/rockchip/clk-rk3188.c |  2 ++
 drivers/clk/rockchip/clk-rk3288.c |  2 ++
 drivers/clk/rockchip/clk.c        | 25 +++++++++++++++++++++++++
 drivers/clk/rockchip/clk.h        |  1 +
 4 files changed, 30 insertions(+)

diff --git a/drivers/clk/rockchip/clk-rk3188.c b/drivers/clk/rockchip/clk-rk3188.c
index a83a6d8..71b661a 100644
--- a/drivers/clk/rockchip/clk-rk3188.c
+++ b/drivers/clk/rockchip/clk-rk3188.c
@@ -631,6 +631,8 @@ static void __init rk3188_common_clk_init(struct device_node *np)
 
 	rockchip_register_softrst(np, 9, reg_base + RK2928_SOFTRST_CON(0),
 				  ROCKCHIP_SOFTRST_HIWORD_MASK);
+
+	rockchip_register_restart_notifier(RK2928_GLB_SRST_FST);
 }
 
 static void __init rk3066a_clk_init(struct device_node *np)
diff --git a/drivers/clk/rockchip/clk-rk3288.c b/drivers/clk/rockchip/clk-rk3288.c
index 0d8c6c5..b604217 100644
--- a/drivers/clk/rockchip/clk-rk3288.c
+++ b/drivers/clk/rockchip/clk-rk3288.c
@@ -713,5 +713,7 @@ static void __init rk3288_clk_init(struct device_node *np)
 
 	rockchip_register_softrst(np, 9, reg_base + RK3288_SOFTRST_CON(0),
 				  ROCKCHIP_SOFTRST_HIWORD_MASK);
+
+	rockchip_register_restart_notifier(RK3288_GLB_SRST_FST);
 }
 CLK_OF_DECLARE(rk3288_cru, "rockchip,rk3288-cru", rk3288_clk_init);
diff --git a/drivers/clk/rockchip/clk.c b/drivers/clk/rockchip/clk.c
index 278cf9d..aa41433 100644
--- a/drivers/clk/rockchip/clk.c
+++ b/drivers/clk/rockchip/clk.c
@@ -25,6 +25,7 @@
 #include <linux/clk-provider.h>
 #include <linux/mfd/syscon.h>
 #include <linux/regmap.h>
+#include <linux/reboot.h>
 #include "clk.h"
 
 /**
@@ -242,3 +243,27 @@ void __init rockchip_clk_register_branches(
 		rockchip_clk_add_lookup(clk, list->id);
 	}
 }
+
+static unsigned int reg_restart;
+static int rockchip_restart_notify(struct notifier_block *this,
+				   unsigned long mode, void *cmd)
+{
+	writel(0xfdb9, reg_base + reg_restart);
+	return NOTIFY_DONE;
+}
+
+static struct notifier_block rockchip_restart_handler = {
+	.notifier_call = rockchip_restart_notify,
+	.priority = 128,
+};
+
+void __init rockchip_register_restart_notifier(unsigned int reg)
+{
+	int ret;
+
+	reg_restart = reg;
+	ret = register_restart_handler(&rockchip_restart_handler);
+	if (ret)
+		pr_err("%s: cannot register restart handler, %d\n",
+		       __func__, ret);
+}
diff --git a/drivers/clk/rockchip/clk.h b/drivers/clk/rockchip/clk.h
index 887cbde..0b5eab5 100644
--- a/drivers/clk/rockchip/clk.h
+++ b/drivers/clk/rockchip/clk.h
@@ -329,6 +329,7 @@ void rockchip_clk_register_branches(struct rockchip_clk_branch *clk_list,
 				    unsigned int nr_clk);
 void rockchip_clk_register_plls(struct rockchip_pll_clock *pll_list,
 				unsigned int nr_pll, int grf_lock_offset);
+void rockchip_register_restart_notifier(unsigned int reg);
 
 #define ROCKCHIP_SOFTRST_HIWORD_MASK	BIT(0)
 
-- 
1.9.1

  parent reply	other threads:[~2014-08-20  0:45 UTC|newest]

Thread overview: 44+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2014-08-20  0:45 [PATCH v7 00/11] kernel: Add support for restart handler call chain Guenter Roeck
2014-08-20  0:45 ` [PATCH v7 01/11] kernel: Add support for kernel " Guenter Roeck
2014-08-21  4:08   ` Doug Anderson
2014-08-20  0:45 ` [PATCH v7 02/11] power/restart: Call machine_restart instead of arm_pm_restart Guenter Roeck
2014-08-21  4:10   ` Doug Anderson
2014-08-21  4:42     ` Guenter Roeck
2014-08-21 19:30       ` Doug Anderson
2014-08-21 20:11         ` Guenter Roeck
2014-08-21 20:39   ` Sebastian Reichel
2014-08-23 17:20     ` Guenter Roeck
2014-08-20  0:45 ` [PATCH v7 03/11] arm64: Support restart through restart handler call chain Guenter Roeck
2014-08-21  4:13   ` Doug Anderson
2014-08-20  0:45 ` [PATCH v7 04/11] arm: " Guenter Roeck
2014-08-21  4:11   ` Doug Anderson
2014-08-22  1:32   ` Andreas Färber
2014-08-22  2:19     ` Guenter Roeck
2014-08-23 17:11       ` Andreas Färber
2014-08-20  0:45 ` [PATCH v7 05/11] watchdog: moxart: Register restart handler with kernel restart handler Guenter Roeck
2014-08-20  0:45 ` [PATCH v7 06/11] watchdog: alim7101: " Guenter Roeck
2014-08-20  0:45 ` [PATCH v7 07/11] watchdog: sunxi: " Guenter Roeck
2014-08-20  0:45 ` [PATCH v7 08/11] arm/arm64: Unexport restart handlers Guenter Roeck
2014-08-21  4:12   ` Doug Anderson
2014-12-04 13:36   ` Geert Uytterhoeven
2014-12-04 14:26     ` Guenter Roeck
2014-12-04 14:44       ` Geert Uytterhoeven
2014-12-04 14:51         ` Guenter Roeck
2014-12-04 15:06           ` Arnd Bergmann
2014-12-04 16:11             ` Guenter Roeck
2014-08-20  0:45 ` [PATCH v7 09/11] watchdog: s3c2410: add restart handler Guenter Roeck
2014-08-20  0:45 ` [PATCH v7 10/11] clk: samsung: register restart handlers for s3c2412 and s3c2443 Guenter Roeck
2014-09-03 19:05   ` Mike Turquette
2014-08-20  0:45 ` Guenter Roeck [this message]
2014-08-21  4:15   ` [PATCH v7 11/11] clk: rockchip: add restart handler Doug Anderson
2014-08-21  8:18     ` Heiko Stübner
2014-09-03 19:05   ` Mike Turquette
2014-08-23 16:35 ` [PATCH v7 00/11] kernel: Add support for restart handler call chain Guenter Roeck
2014-08-23 23:00   ` Heiko Stübner
2014-08-24  0:17     ` Guenter Roeck
2014-09-19 12:54 ` Pramod Gurav
2014-09-30 21:20 ` Andrew Morton
2014-09-30 22:30   ` Guenter Roeck
2014-09-30 23:40     ` Stephen Rothwell
2014-10-01  3:28       ` Guenter Roeck
2014-10-01 13:32     ` Heiko Stübner

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=1408495538-27480-12-git-send-email-linux@roeck-us.net \
    --to=linux@roeck-us.net \
    --cc=linux-arm-kernel@lists.infradead.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).