You cannot select more than 25 topics
Topics must start with a letter or number, can include dashes ('-') and can be up to 35 characters long.
29 lines
1002 B
Diff
29 lines
1002 B
Diff
From 30e5365b3ad3858bbdf40e8364c1e3260861b4e4 Mon Sep 17 00:00:00 2001
|
|
From: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
Date: Sun, 2 Feb 2014 14:55:24 +0100
|
|
Subject: [PATCH] ARM: sunxi: Add the new watchog compatibles to the reboot
|
|
code
|
|
|
|
Now that the watchdog driver has new compatibles, we need to support them in
|
|
the machine reboot code too.
|
|
|
|
Signed-off-by: Maxime Ripard <maxime.ripard@free-electrons.com>
|
|
---
|
|
arch/arm/mach-sunxi/sunxi.c | 2 ++
|
|
1 file changed, 2 insertions(+)
|
|
|
|
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
|
|
index aeea6ce..c310df6 100644
|
|
--- a/arch/arm/mach-sunxi/sunxi.c
|
|
+++ b/arch/arm/mach-sunxi/sunxi.c
|
|
@@ -95,7 +95,9 @@ static void sun6i_restart(enum reboot_mode mode, const char *cmd)
|
|
|
|
static struct of_device_id sunxi_restart_ids[] = {
|
|
{ .compatible = "allwinner,sun4i-wdt" },
|
|
+ { .compatible = "allwinner,sun4i-a10-wdt" },
|
|
{ .compatible = "allwinner,sun6i-wdt" },
|
|
+ { .compatible = "allwinner,sun6i-a31-wdt" },
|
|
{ /*sentinel*/ }
|
|
};
|
|
|