]> git.ipfire.org Git - thirdparty/kernel/stable.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>
Tue, 10 Nov 2020 09:22:18 +0000 (10:22 +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 45f2a5930379a504c993e3da35066d2409f94702..7da18cc30d101f4f92b203d290ddba94691e42df 100644 (file)
@@ -676,7 +676,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