]> git.ipfire.org Git - people/arne_f/kernel.git/commitdiff
ARM: s3c24xx: fix missing system reset
authorKrzysztof Kozlowski <krzk@kernel.org>
Tue, 4 Aug 2020 19:26:49 +0000 (21:26 +0200)
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>
Thu, 5 Nov 2020 10:07:05 +0000 (11:07 +0100)
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>
arch/arm/Kconfig

index 7a8fbe9a077bb2d6e54c6342440776ff79f089b8..89f7d0c2824066313f9e64a64a5d203eceb476f1 100644 (file)
@@ -602,7 +602,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