summaryrefslogtreecommitdiffstats
path: root/arch/arm/mach-sunxi
diff options
context:
space:
mode:
authorArnd Bergmann <arnd@arndb.de>2014-03-17 14:41:54 +0100
committerArnd Bergmann <arnd@arndb.de>2014-03-17 14:41:54 +0100
commit780d2bf3d07db0c88860a6c8e4e551cfe07f780d (patch)
tree7516792b2fb75305ebb0458c22a1e7cbb6a73324 /arch/arm/mach-sunxi
parente7f274dccf7f18a58b86aa8cbd269cdfbdb08056 (diff)
parent8db21ad469fda194913db2c5b11635bcc21345fc (diff)
downloadlinux-780d2bf3d07db0c88860a6c8e4e551cfe07f780d.tar.bz2
Merge tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux into next/soc
Merge "Allwinner core additions for 3.15" from Maxime Ripard: Just a minor commit to adjust the restart code to take into account the new compatibles * tag 'sunxi-core-for-3.15' of https://github.com/mripard/linux: ARM: sunxi: Add the new watchog compatibles to the reboot code Signed-off-by: Arnd Bergmann <arnd@arndb.de>
Diffstat (limited to 'arch/arm/mach-sunxi')
-rw-r--r--arch/arm/mach-sunxi/sunxi.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/arch/arm/mach-sunxi/sunxi.c b/arch/arm/mach-sunxi/sunxi.c
index aeea6ceea725..460b5a4962ef 100644
--- a/arch/arm/mach-sunxi/sunxi.c
+++ b/arch/arm/mach-sunxi/sunxi.c
@@ -94,8 +94,8 @@ 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,sun6i-wdt" },
+ { .compatible = "allwinner,sun4i-a10-wdt" },
+ { .compatible = "allwinner,sun6i-a31-wdt" },
{ /*sentinel*/ }
};