diff options
| author | Zoltan HERPAI <wigyori@uid0.hu> | 2014-09-15 21:05:00 +0000 |
|---|---|---|
| committer | Zoltan HERPAI <wigyori@uid0.hu> | 2014-09-15 21:05:00 +0000 |
| commit | e2520eb771fc8ca6ea679895bbc8c0a10a2ff045 (patch) | |
| tree | 15d0e9c4ee2a8db9dbee5f63fd1ccc31d0eeacb2 /target/linux/sunxi | |
| parent | 78efb4c9ca04f9834f98177afb6ba913a5b1a657 (diff) | |
| download | master-187ad058-e2520eb771fc8ca6ea679895bbc8c0a10a2ff045.tar.gz master-187ad058-e2520eb771fc8ca6ea679895bbc8c0a10a2ff045.tar.bz2 master-187ad058-e2520eb771fc8ca6ea679895bbc8c0a10a2ff045.zip | |
sunxi: add new watchdog compats to reboot code in 3.14
Signed-off-by: Zoltan HERPAI <wigyori@uid0.hu>
git-svn-id: svn://svn.openwrt.org/openwrt/trunk@42558 3c298f89-4303-0410-b956-a3cf2f4a3e73
Diffstat (limited to 'target/linux/sunxi')
| -rw-r--r-- | target/linux/sunxi/patches-3.14/157-mach-add-new-wdtcompats-to-reboot-code.patch | 28 |
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*/ } + }; + |