summaryrefslogtreecommitdiffstats
path: root/arch
diff options
context:
space:
mode:
authorLihua Yao <ylhuajnu@outlook.com>2019-09-07 03:30:01 +0000
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2019-10-05 13:14:06 +0200
commitb9cbc0df92c398b9fb2a111162bb5aeadf97b4d2 (patch)
treec194a216690c9777f57929a3d62dc838795bcbce /arch
parentf1592b7543505efb10b821ce4112bc4bf22ac52a (diff)
downloadlinux-stable-b9cbc0df92c398b9fb2a111162bb5aeadf97b4d2.tar.gz
linux-stable-b9cbc0df92c398b9fb2a111162bb5aeadf97b4d2.tar.bz2
linux-stable-b9cbc0df92c398b9fb2a111162bb5aeadf97b4d2.zip
ARM: samsung: Fix system restart on S3C6410
commit 16986074035cc0205472882a00d404ed9d213313 upstream. S3C6410 system restart is triggered by watchdog reset. Cc: <stable@vger.kernel.org> Fixes: 9f55342cc2de ("ARM: dts: s3c64xx: Fix infinite interrupt in soft mode") Signed-off-by: Lihua Yao <ylhuajnu@outlook.com> Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
Diffstat (limited to 'arch')
-rw-r--r--arch/arm/plat-samsung/watchdog-reset.c1
1 files changed, 1 insertions, 0 deletions
diff --git a/arch/arm/plat-samsung/watchdog-reset.c b/arch/arm/plat-samsung/watchdog-reset.c
index ce42cc640a61..71d85ff323f7 100644
--- a/arch/arm/plat-samsung/watchdog-reset.c
+++ b/arch/arm/plat-samsung/watchdog-reset.c
@@ -62,6 +62,7 @@ void samsung_wdt_reset(void)
#ifdef CONFIG_OF
static const struct of_device_id s3c2410_wdt_match[] = {
{ .compatible = "samsung,s3c2410-wdt" },
+ { .compatible = "samsung,s3c6410-wdt" },
{},
};