Groups | Search | Server Info | Keyboard shortcuts | Login | Register [http] [https] [nntp] [nntps]

Groups > linux.kernel > #1374213

[PATCH 1/6] ARM: prima2: Register with kernel restart handler

Show all headers | View raw

Register with kernel restart handler instead of setting arm_pm_restart
directly. By doing this, the prima2 reset handler can be prioritized
among other restart methods available on a particular board.

Select a high priority of 192 since the original code overwrites the
default arm restart handler.

Signed-off-by: Guenter Roeck <linux@roeck-us.net>
---
 arch/arm/mach-prima2/rstc.c | 11 +++++++++--
 1 file changed, 9 insertions(+), 2 deletions(-)

diff --git a/arch/arm/mach-prima2/rstc.c b/arch/arm/mach-prima2/rstc.c
index 7c251eb11d01..1639997c5b49 100644
--- a/arch/arm/mach-prima2/rstc.c
+++ b/arch/arm/mach-prima2/rstc.c
@@ -65,11 +65,18 @@ static struct reset_controller_dev sirfsoc_reset_controller = {
 
 #define SIRFSOC_SYS_RST_BIT  BIT(31)
 
-static void sirfsoc_restart(enum reboot_mode mode, const char *cmd)
+static int sirfsoc_restart(struct notifier_block *nb, unsigned long action,
+			   void *data)
 {
 	writel(SIRFSOC_SYS_RST_BIT, sirfsoc_rstc_base);
+	return NOTIFY_DONE;
 }
 
+static struct notifier_block sirfsoc_restart_nb = {
+	.notifier_call  = sirfsoc_restart,
+	.priority       = 192,
+};
+
 static int sirfsoc_rstc_probe(struct platform_device *pdev)
 {
 	struct device_node *np = pdev->dev.of_node;
@@ -80,7 +87,7 @@ static int sirfsoc_rstc_probe(struct platform_device *pdev)
 	}
 
 	sirfsoc_reset_controller.of_node = np;
-	arm_pm_restart = sirfsoc_restart;
+	register_restart_handler(&sirfsoc_restart_nb);
 
 	if (IS_ENABLED(CONFIG_RESET_CONTROLLER))
 		reset_controller_register(&sirfsoc_reset_controller);
-- 
2.5.0

Back to linux.kernel | Previous | Next — Previous in thread | Next in thread | Find similar | Unroll thread

Thread

[PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
    Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-12 17:40 +0200
    Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Mark Rutland <mark.rutland@arm.com> - 2016-04-13 13:10 +0200
      Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Jisheng Zhang <jszhang@marvell.com> - 2016-04-13 13:40 +0200
      Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-13 15:20 +0200
        Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Geert Uytterhoeven <geert@linux-m68k.org> - 2016-04-13 15:30 +0200
          Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-14 02:50 +0200
            Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-14 11:00 +0200
              Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-14 15:30 +0200
                Re: [PATCH 3/6] ARM: PSCI: Register with kernel restart handler Wolfram Sang <wsa@the-dreams.de> - 2016-04-14 16:40 +0200
  [PATCH 1/6] ARM: prima2: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 6/6] ARM: Remove arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 4/6] ARM: Register with kernel restart handler Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
  [PATCH 5/6] ARM64: Remove arm_pm_restart Guenter Roeck <linux@roeck-us.net> - 2016-04-08 15:00 +0200
    Re: [PATCH 5/6] ARM64: Remove arm_pm_restart Catalin Marinas <catalin.marinas@arm.com> - 2016-04-12 15:20 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang <wsa@the-dreams.de> - 2016-04-08 17:50 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Arnd Bergmann <arnd@arndb.de> - 2016-04-08 22:50 +0200
  Re: [PATCH 0/6] ARM/ARM64: Drop arm_pm_restart Wolfram Sang <wsa@the-dreams.de> - 2016-04-12 17:50 +0200

csiph-web