summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorKrzysztof Kozlowski <krzk@kernel.org>2020-08-04 21:26:49 +0200
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2020-11-05 11:51:55 +0100
commit8cad84ff21ea8105d891c09645a38b7d8ffe3c6b (patch)
treef19ae8cf0290256d5ff25009b12fdf0d79a2bc00
parentb5ddb8d581bb7b030a57cfe53de50dad428af685 (diff)
downloadlinux-stable-8cad84ff21ea8105d891c09645a38b7d8ffe3c6b.tar.gz
linux-stable-8cad84ff21ea8105d891c09645a38b7d8ffe3c6b.tar.bz2
linux-stable-8cad84ff21ea8105d891c09645a38b7d8ffe3c6b.zip
ARM: s3c24xx: fix missing system reset
commit f6d7cde84f6c5551586c8b9b68d70f8e6dc9a000 upstream. Commit f6361c6b3880 ("ARM: S3C24XX: remove separate restart code") removed usage of the watchdog reset platform code in favor of the Samsung SoC watchdog driver. However the latter was not selected thus S3C24xx platforms lost reset abilities. Cc: <stable@vger.kernel.org> Fixes: f6361c6b3880 ("ARM: S3C24XX: remove separate restart code") Signed-off-by: Krzysztof Kozlowski <krzk@kernel.org> Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
-rw-r--r--arch/arm/Kconfig2
1 files changed, 2 insertions, 0 deletions
diff --git a/arch/arm/Kconfig b/arch/arm/Kconfig
index e00d94b16658..23e2c0dc85c1 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -506,8 +506,10 @@ config ARCH_S3C24XX
select HAVE_S3C2410_WATCHDOG if WATCHDOG
select HAVE_S3C_RTC if RTC_CLASS
select NEED_MACH_IO_H
+ select S3C2410_WATCHDOG
select SAMSUNG_ATAGS
select USE_OF
+ select WATCHDOG
help
Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
and S3C2450 SoCs based systems, such as the Simtec Electronics BAST