sunxi: add new watchdog compats to reboot code in 3.14

Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>

SVN-Revision: 42558
This commit is contained in:
Zoltan Herpai 2014-09-15 21:05:00 +00:00
parent 8ef9dec08f
commit 78726df7bd

View file

@ -0,0 +1,28 @@
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*/ }
};