aboutsummaryrefslogtreecommitdiffstats
path: root/target
diff options
context:
space:
mode:
authorZoltan Herpai <wigyori@uid0.hu>2014-09-15 21:05:00 +0000
committerZoltan Herpai <wigyori@uid0.hu>2014-09-15 21:05:00 +0000
commit78726df7bdb3df7d816b4b52c536e04d512c21e2 (patch)
treea3d6c91e0e147b2ad1e741cd9cc58131d96d0cc8 /target
parent8ef9dec08f9faa0d63ac80f9f3ffe0075768e9c0 (diff)
downloadupstream-78726df7bdb3df7d816b4b52c536e04d512c21e2.tar.gz
upstream-78726df7bdb3df7d816b4b52c536e04d512c21e2.tar.bz2
upstream-78726df7bdb3df7d816b4b52c536e04d512c21e2.zip
sunxi: add new watchdog compats to reboot code in 3.14
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu> SVN-Revision: 42558
Diffstat (limited to 'target')
-rw-r--r--target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch28
1 files changed, 28 insertions, 0 deletions
diff --git a/target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch b/target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch
new file mode 100644
index 0000000000..ea1ac32f2b
--- /dev/null
+++ b/target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch
@@ -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*/ }
+ };
+