diff mbox series

[4.9,085/117] ARM: s3c24xx: fix missing system reset

Message ID	20201109125029.722160245@linuxfoundation.org
State	New
Headers	show Return-Path: <SRS0=upl/=EP=vger.kernel.org=stable-owner@kernel.org> From: Greg Kroah-Hartman <gregkh@linuxfoundation.org> To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman <gregkh@linuxfoundation.org>, stable@vger.kernel.org, Krzysztof Kozlowski <krzk@kernel.org> Subject: [PATCH 4.9 085/117] ARM: s3c24xx: fix missing system reset Date: Mon, 9 Nov 2020 13:55:11 +0100 Message-Id: <20201109125029.722160245@linuxfoundation.org> In-Reply-To: <20201109125025.630721781@linuxfoundation.org> References: <20201109125025.630721781@linuxfoundation.org> User-Agent: quilt/0.66 MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Precedence: bulk
Series	None \| expand [4.9,002/117] scripts/setlocalversion: make git describe output more reliable [4.9,005/117] ravb: Fix bit fields checking in ravb_hwtstamp_get() [4.9,006/117] tipc: fix memory leak caused by tipc_buf_append() [4.9,008/117] fuse: fix page dereference after free [4.9,010/117] mtd: lpddr: Fix bad logic in print_drs_error [4.9,011/117] ata: sata_rcar: Fix DMA boundary mask [4.9,013/117] fscrypto: move ioctl processing more fully into common code [4.9,014/117] fscrypt: use EEXIST when file already uses different policy [4.9,015/117] mlxsw: core: Fix use-after-free in mlxsw_emad_trans_finish() [4.9,018/117] f2fs: add trace exit in exception path [4.9,020/117] um: change sigio_spinlock to a mutex [4.9,022/117] xfs: fix realtime bitmap/summary file truncation when growing rt volume [4.9,024/117] ath10k: fix VHT NSS calculation when STBC is enabled [4.9,026/117] mmc: via-sdmmc: Fix data race bug [4.9,029/117] cpufreq: sti-cpufreq: add stih418 support [4.9,031/117] arm64/mm: return cpu_all_mask when node is NUMA_NO_NODE [4.9,035/117] md/bitmap: md_bitmap_get_counter returns wrong blocks [4.9,038/117] drivers: watchdog: rdc321x_wdt: Fix race condition bugs [4.9,039/117] ext4: Detect already used quota file early [4.9,041/117] memory: emif: Remove bogus debugfs error handling [4.9,043/117] ARM: dts: s5pv210: move PMU node out of clock controller [4.9,045/117] md/raid5: fix oops during stripe resizing [4.9,046/117] perf/x86/amd/ibs: Dont include randomized bits in get_ibs_op_count() [4.9,049/117] fs: Dont invalidate page buffers in block_write_full_page() [4.9,051/117] ACPI / extlog: Check for RDMSR failure [4.9,052/117] ACPI: video: use ACPI backlight for HP 635 Notebook [4.9,055/117] w1: mxc_w1: Fix timeout resolution problem leading to bus error [4.9,060/117] usb: dwc3: core: add phy cleanup for probe error handling [4.9,063/117] vt: keyboard, simplify vt_kdgkbsent [4.9,064/117] vt: keyboard, extend func_buf_lock to readers [4.9,065/117] dmaengine: dma-jz4780: Fix race in jz4780_dma_tx_status [4.9,066/117] iio:light:si1145: Fix timestamp alignment and prevent data leak. [4.9,067/117] iio:adc:ti-adc12138 Fix alignment issue with timestamp [4.9,068/117] iio:gyro:itg3200: Fix timestamp alignment and prevent data leak. [4.9,069/117] powerpc: Warn about use of smt_snooze_delay [4.9,070/117] powerpc/powernv/elog: Fix race while processing OPAL error log event. [4.9,071/117] ubifs: dent: Fix some potential memory leaks while iterating entries [4.9,074/117] ceph: promote to unsigned long long before shifting [4.9,077/117] ring-buffer: Return 0 on success from ring_buffer_resize() [4.9,079/117] rtc: rx8010: dont modify the global rtc ops [4.9,080/117] tty: make FONTX ioctl use the tty pointer they were actually passed [4.9,083/117] hil/parisc: Disable HIL driver when it gets stuck [4.9,084/117] ARM: samsung: fix PM debug build with DEBUG_LL but !MMU [4.9,085/117] ARM: s3c24xx: fix missing system reset [4.9,087/117] device property: Dont clear secondary pointer for shared primary firmware node [4.9,090/117] staging: octeon: repair "fixed-link" support [4.9,091/117] staging: octeon: Drop on uncorrectable alignment or FCS error [4.9,093/117] tipc: fix use-after-free in tipc_bcast_get_mode [4.9,096/117] Fonts: Replace discarded const qualifier [4.9,099/117] ftrace: Fix recursion check for NMI test [4.9,100/117] ftrace: Handle tracing when switching between context [4.9,102/117] ARM: dts: sun4i-a10: fix cpu_alert temperature [4.9,103/117] x86/kexec: Use up-to-dated screen_info copy to fill boot params [4.9,106/117] vsock: use ns_capable_noaudit() on socket create [4.9,108/117] vt: Disable KD_FONT_OP_COPY [4.9,111/117] serial: txx9: add missing platform_driver_unregister() on error in serial_txx9_init [4.9,113/117] USB: serial: option: add LE910Cx compositions 0x1203, 0x1230, 0x1231 [4.9,114/117] USB: serial: option: add Telit FN980 composition 0x1055 [4.9,116/117] ARC: stack unwinding: avoid indefinite looping [4.9,117/117] Revert "ARC: entry: fix potential EFA clobber when TIF_SYSCALL_TRACE"

Commit Message

Greg Kroah-Hartman Nov. 9, 2020, 12:55 p.m. UTC

From: Krzysztof Kozlowski <krzk@kernel.org>

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 |    2 ++
 1 file changed, 2 insertions(+)

diff mbox series

Patch

--- 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