diff options
author | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 20:07:51 +0300 |
---|---|---|
committer | Linus Torvalds <torvalds@linux-foundation.org> | 2021-02-22 20:07:51 +0300 |
commit | deb8d159a0a69bd19a328c700bb42b802cbcf7b5 (patch) | |
tree | aee36dbc96ceaf57ac22f39cef3c8ef92cab16c2 /drivers/watchdog/Kconfig | |
parent | 19472481bf58f7c6c939668be885bd300afcb6c6 (diff) | |
parent | a4f3407c41605d14f09e490045d0609990cd5d94 (diff) | |
download | linux-deb8d159a0a69bd19a328c700bb42b802cbcf7b5.tar.xz |
Merge tag 'linux-watchdog-5.12-rc1' of git://www.linux-watchdog.org/linux-watchdog
Pull watchdog updates from Wim Van Sebroeck:
"New drivers:
- Intel Keembay Soc
New chip versions:
- sun4i: Add H616 compatible string
- mt8192 wdt support
- more Rockchip compatibles to snps,dw-wdt.yaml
- binding for Qcom SDX55
- r8a779a0 (V3U) support
Removed drivers:
- sirf prima watchdog driver
- sirf atlas watchdog driver
- zte zx watchdog driver
- tango watchdog driver
- coh901 watchdog driver
And several fixes and clean-ups"
* tag 'linux-watchdog-5.12-rc1' of git://www.linux-watchdog.org/linux-watchdog: (24 commits)
watchdog: qcom: Remove incorrect usage of QCOM_WDT_ENABLE_IRQ
watchdog: mei_wdt: request stop on unregister
dt-bindings: watchdog: Add binding for Qcom SDX55
watchdog: remove coh901 driver
watchdog: remove tango driver
watchdog: remove zte zx driver
watchdog: remove sirf atlas driver
watchdog: remove sirf prima driver
watchdog: mt8192: add wdt support
dt-binding: mt8192: add toprgu reset-controller head file
dt-binding: mediatek: mt8192: update mtk-wdt document
dt-binding: mediatek: watchdog: fix the description of compatible
dt-binding: watchdog: add more Rockchip compatibles to snps,dw-wdt.yaml
dt-bindings: watchdog: sun4i: Add H616 compatible string
watchdog: mtk_wdt: Remove mtk_wdt_stop() in probe() to prevent the system freeze and it doesn't reboot by watchdog problem
watchdog: renesas_wdt: add grace period before rebooting
watchdog: stop wdd when watchdog hw running in reboot_notifier
watchdog: ziirave_wdt: remove unused including <linux/version.h>
dt-bindings: watchdog: renesas,wdt: add r8a779a0 (V3U) support
watchdog: renesas_wdt: don't sleep in atomic context
...
Diffstat (limited to 'drivers/watchdog/Kconfig')
-rw-r--r-- | drivers/watchdog/Kconfig | 65 |
1 files changed, 13 insertions, 52 deletions
diff --git a/drivers/watchdog/Kconfig b/drivers/watchdog/Kconfig index 6b9e93d8532b..1fe0042a48d2 100644 --- a/drivers/watchdog/Kconfig +++ b/drivers/watchdog/Kconfig @@ -254,17 +254,6 @@ config MENZ069_WATCHDOG This driver can also be built as a module. If so the module will be called menz069_wdt. -config TANGOX_WATCHDOG - tristate "Sigma Designs SMP86xx/SMP87xx watchdog" - select WATCHDOG_CORE - depends on ARCH_TANGO || COMPILE_TEST - depends on HAS_IOMEM - help - Support for the watchdog in Sigma Designs SMP86xx (tango3) - and SMP87xx (tango4) family chips. - - This driver can be built as a module. The module name is tangox_wdt. - config WDAT_WDT tristate "ACPI Watchdog Action Table (WDAT)" depends on ACPI @@ -630,17 +619,6 @@ config SUNXI_WATCHDOG To compile this driver as a module, choose M here: the module will be called sunxi_wdt. -config COH901327_WATCHDOG - bool "ST-Ericsson COH 901 327 watchdog" - depends on ARCH_U300 || (ARM && COMMON_CLK && COMPILE_TEST) - default y if MACH_U300 - select WATCHDOG_CORE - help - Say Y here to include Watchdog timer support for the - watchdog embedded into the ST-Ericsson U300 series platforms. - This watchdog is used to reset the system and thus cannot be - compiled as a module. - config NPCM7XX_WATCHDOG tristate "Nuvoton NPCM750 watchdog" depends on ARCH_NPCM || COMPILE_TEST @@ -788,16 +766,6 @@ config MOXART_WDT To compile this driver as a module, choose M here: the module will be called moxart_wdt. -config SIRFSOC_WATCHDOG - tristate "SiRFSOC watchdog" - depends on HAS_IOMEM - depends on ARCH_SIRF || COMPILE_TEST - select WATCHDOG_CORE - default y - help - Support for CSR SiRFprimaII and SiRFatlasVI watchdog. When - the watchdog triggers the system will be reset. - config ST_LPC_WATCHDOG tristate "STMicroelectronics LPC Watchdog" depends on ARCH_STI || COMPILE_TEST @@ -900,16 +868,6 @@ config LPC18XX_WATCHDOG To compile this driver as a module, choose M here: the module will be called lpc18xx_wdt. -config ATLAS7_WATCHDOG - tristate "CSRatlas7 watchdog" - depends on ARCH_ATLAS7 || COMPILE_TEST - help - Say Y here to include Watchdog timer support for the watchdog - existing on the CSRatlas7 series platforms. - - To compile this driver as a module, choose M here: the - module will be called atlas7_wdt. - config RENESAS_WDT tristate "Renesas WDT Watchdog" depends on ARCH_RENESAS || COMPILE_TEST @@ -939,16 +897,6 @@ config ASPEED_WATCHDOG To compile this driver as a module, choose M here: the module will be called aspeed_wdt. -config ZX2967_WATCHDOG - tristate "ZTE zx2967 SoCs watchdog support" - depends on ARCH_ZX - select WATCHDOG_CORE - help - Say Y here to include support for the watchdog timer - in ZTE zx2967 SoCs. - To compile this driver as a module, choose M here: the - module will be called zx2967_wdt. - config STM32_WATCHDOG tristate "STM32 Independent WatchDoG (IWDG) support" depends on ARCH_STM32 @@ -2146,4 +2094,17 @@ config USBPCWATCHDOG Most people will say N. +config KEEMBAY_WATCHDOG + tristate "Intel Keem Bay SoC non-secure watchdog" + depends on ARCH_KEEMBAY || (ARM64 && COMPILE_TEST) + select WATCHDOG_CORE + help + This option enable support for an In-secure watchdog timer driver for + Intel Keem Bay SoC. This WDT has a 32 bit timer and decrements in every + count unit. An interrupt will be triggered, when the count crosses + the thershold configured in the register. + + To compile this driver as a module, choose M here: the + module will be called keembay_wdt. + endif # WATCHDOG |