summaryrefslogtreecommitdiff
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-10 10:24:00 +0100
commit1c71edbce57f6b17213e68300247acdb1ecf3a94 (patch)
tree635c1f50b38b321b234c4816301872706bb63066
parent2e76c253a015294f05ab79df91355e30ba6cd42f (diff)
downloadlinux-1c71edbce57f6b17213e68300247acdb1ecf3a94.tar.gz
linux-1c71edbce57f6b17213e68300247acdb1ecf3a94.tar.bz2
linux-1c71edbce57f6b17213e68300247acdb1ecf3a94.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 56bd9beb6a35..ae55f5db97f8 100644
--- a/arch/arm/Kconfig
+++ b/arch/arm/Kconfig
@@ -601,7 +601,9 @@ config ARCH_S3C24XX
select HAVE_S3C_RTC if RTC_CLASS
select MULTI_IRQ_HANDLER
select NEED_MACH_IO_H
+ select S3C2410_WATCHDOG
select SAMSUNG_ATAGS
+ select WATCHDOG
help
Samsung S3C2410, S3C2412, S3C2413, S3C2416, S3C2440, S3C2442, S3C2443
and S3C2450 SoCs based systems, such as the Simtec Electronics BAST