forked from ~ljy/RK356X_SDK_RELEASE

blame | history | patch | commit | commitdiff
hc
2024-05-14 bedbef8ad3e75a304af6361af235302bcc61d06b 
 kernel/drivers/watchdog/Kconfig
....@@ -1,3 +1,4 @@
1
+# SPDX-License-Identifier: GPL-2.0-only
12 
23 #
34 # Watchdog device configuration
....@@ -5,7 +6,7 @@
56 
67 menuconfig WATCHDOG
78 	bool "Watchdog Timer Support"
8
-	---help---
9
+	help
910 	  If you say Y here (and to one of the following options) and create a
1011 	  character special file /dev/watchdog with major number 10 and minor
1112 	  number 130 using mknod ("man mknod"), you will get a watchdog, i.e.:
....@@ -17,7 +18,7 @@
1718 	  reboot the machine) and a driver for hardware watchdog boards, which
1819 	  are more robust and can also keep track of the temperature inside
1920 	  your computer. For details, read
20
-	  <file:Documentation/watchdog/watchdog-api.txt> in the kernel source.
21
+	  <file:Documentation/watchdog/watchdog-api.rst> in the kernel source.
2122 
2223 	  The watchdog is usually used together with the watchdog daemon
2324 	  which is available from
....@@ -30,8 +31,8 @@
3031 if WATCHDOG
3132 
3233 config WATCHDOG_CORE
33
-	bool "WatchDog Timer Driver Core"
34
-	---help---
34
+	tristate "WatchDog Timer Driver Core"
35
+	help
3536 	  Say Y here if you want to use the new watchdog timer driver core.
3637 	  This driver provides a framework for all watchdog timer drivers
3738 	  and gives them the /dev/watchdog interface (and later also the
....@@ -57,11 +58,80 @@
5758 	  the watchdog on its own. Thus if your userspace does not start fast
5859 	  enough your device will reboot.
5960 
61
+config WATCHDOG_OPEN_TIMEOUT
62
+	int "Timeout value for opening watchdog device"
63
+	default 0
64
+	help
65
+	  The maximum time, in seconds, for which the watchdog framework takes
66
+	  care of pinging a hardware watchdog.  A value of 0 means infinite. The
67
+	  value set here can be overridden by the commandline parameter
68
+	  "watchdog.open_timeout".
69
+
6070 config WATCHDOG_SYSFS
6171 	bool "Read different watchdog information through sysfs"
6272 	help
6373 	  Say Y here if you want to enable watchdog device status read through
6474 	  sysfs attributes.
75
+
76
+comment "Watchdog Pretimeout Governors"
77
+
78
+config WATCHDOG_PRETIMEOUT_GOV
79
+	bool "Enable watchdog pretimeout governors"
80
+	depends on WATCHDOG_CORE
81
+	help
82
+	  The option allows to select watchdog pretimeout governors.
83
+
84
+config WATCHDOG_PRETIMEOUT_GOV_SEL
85
+	tristate
86
+	depends on WATCHDOG_PRETIMEOUT_GOV
87
+	default m
88
+	select WATCHDOG_PRETIMEOUT_GOV_PANIC if WATCHDOG_PRETIMEOUT_GOV_NOOP=n
89
+
90
+if WATCHDOG_PRETIMEOUT_GOV
91
+
92
+config WATCHDOG_PRETIMEOUT_GOV_NOOP
93
+	tristate "Noop watchdog pretimeout governor"
94
+	depends on WATCHDOG_CORE
95
+	default WATCHDOG_CORE
96
+	help
97
+	  Noop watchdog pretimeout governor, only an informational
98
+	  message is added to kernel log buffer.
99
+
100
+config WATCHDOG_PRETIMEOUT_GOV_PANIC
101
+	tristate "Panic watchdog pretimeout governor"
102
+	depends on WATCHDOG_CORE
103
+	default WATCHDOG_CORE
104
+	help
105
+	  Panic watchdog pretimeout governor, on watchdog pretimeout
106
+	  event put the kernel into panic.
107
+
108
+choice
109
+	prompt "Default Watchdog Pretimeout Governor"
110
+	default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
111
+	help
112
+	  This option selects a default watchdog pretimeout governor.
113
+	  The governor takes its action, if a watchdog is capable
114
+	  to report a pretimeout event.
115
+
116
+config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP
117
+	bool "noop"
118
+	depends on WATCHDOG_PRETIMEOUT_GOV_NOOP
119
+	help
120
+	  Use noop watchdog pretimeout governor by default. If noop
121
+	  governor is selected by a user, write a short message to
122
+	  the kernel log buffer and don't do any system changes.
123
+
124
+config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
125
+	bool "panic"
126
+	depends on WATCHDOG_PRETIMEOUT_GOV_PANIC
127
+	help
128
+	  Use panic watchdog pretimeout governor by default, if
129
+	  a watchdog pretimeout event happens, consider that
130
+	  a watchdog feeder is dead and reboot is unavoidable.
131
+
132
+endchoice
133
+
134
+endif # WATCHDOG_PRETIMEOUT_GOV
65135 
66136 #
67137 # General Watchdog drivers
....@@ -89,6 +159,18 @@
89159 	  Enable this if you want to use pretimeout governors with the software
90160 	  watchdog. Be aware that governors might affect the watchdog because it
91161 	  is purely software, e.g. the panic governor will stall it!
162
+
163
+config BD70528_WATCHDOG
164
+	tristate "ROHM BD70528 PMIC Watchdog"
165
+	depends on MFD_ROHM_BD70528
166
+	select WATCHDOG_CORE
167
+	help
168
+	  Support for the watchdog in the ROHM BD70528 PMIC. Watchdog trigger
169
+	  cause system reset.
170
+
171
+	  Say Y here to include support for the ROHM BD70528 watchdog.
172
+	  Alternatively say M to compile the driver as a module,
173
+	  which will be called bd70528_wdt.
92174 
93175 config DA9052_WATCHDOG
94176 	tristate "Dialog DA9052 Watchdog"
....@@ -125,6 +207,7 @@
125207 config DA9062_WATCHDOG
126208 	tristate "Dialog DA9062/61 Watchdog"
127209 	depends on MFD_DA9062 || COMPILE_TEST
210
+	depends on I2C
128211 	select WATCHDOG_CORE
129212 	help
130213 	  Support for the watchdog in the DA9062 and DA9061 PMICs.
....@@ -241,6 +324,33 @@
241324 	help
242325 	  Support for the watchdog on RAVE SP device.
243326 
327
+config MLX_WDT
328
+	tristate "Mellanox Watchdog"
329
+	depends on MELLANOX_PLATFORM
330
+	select WATCHDOG_CORE
331
+	select REGMAP
332
+	help
333
+	  This is the driver for the hardware watchdog on Mellanox systems.
334
+	  If you are going to use it, say Y here, otherwise N.
335
+	  This driver can be used together with the watchdog daemon.
336
+	  It can also watch your kernel to make sure it doesn't freeze,
337
+	  and if it does, it reboots your system after a certain amount of
338
+	  time.
339
+
340
+	  To compile this driver as a module, choose M here: the
341
+	  module will be called mlx-wdt.
342
+
343
+config SL28CPLD_WATCHDOG
344
+	tristate "Kontron sl28cpld Watchdog"
345
+	depends on MFD_SL28CPLD || COMPILE_TEST
346
+	select WATCHDOG_CORE
347
+	help
348
+	  Say Y here to include support for the watchdog timer
349
+	  on the Kontron sl28 CPLD.
350
+
351
+	  To compile this driver as a module, choose M here: the
352
+	  module will be called sl28cpld_wdt.
353
+
244354 # ALPHA Architecture
245355 
246356 # ARM Architecture
....@@ -272,6 +382,18 @@
272382 
273383 	  To compile this driver as module, choose M here: The module
274384 	  will be called sbsa_gwdt.
385
+
386
+config ARMADA_37XX_WATCHDOG
387
+	tristate "Armada 37xx watchdog"
388
+	depends on ARCH_MVEBU || COMPILE_TEST
389
+	depends on HAS_IOMEM
390
+	select MFD_SYSCON
391
+	select WATCHDOG_CORE
392
+	help
393
+	   Say Y here to include support for the watchdog timer found on
394
+	   Marvell Armada 37xx SoCs.
395
+	   To compile this driver as a module, choose M here: the
396
+	   module will be called armada_37xx_wdt.
275397 
276398 config ASM9260_WATCHDOG
277399 	tristate "Alphascale ASM9260 watchdog"
....@@ -368,23 +490,10 @@
368490 
369491 	  Say N if you are unsure.
370492 
371
-config KS8695_WATCHDOG
372
-	tristate "KS8695 watchdog"
373
-	depends on ARCH_KS8695
374
-	help
375
-	  Watchdog timer embedded into KS8695 processor. This will reboot your
376
-	  system when the timeout is reached.
377
-
378
-config HAVE_S3C2410_WATCHDOG
379
-	bool
380
-	help
381
-	  This will include watchdog timer support for Samsung SoCs. If
382
-	  you want to include watchdog support for any machine, kindly
383
-	  select this in the respective mach-XXXX/Kconfig file.
384
-
385493 config S3C2410_WATCHDOG
386494 	tristate "S3C2410 Watchdog"
387
-	depends on HAVE_S3C2410_WATCHDOG || COMPILE_TEST
495
+	depends on ARCH_S3C24XX || ARCH_S3C64XX || ARCH_S5PV210 || ARCH_EXYNOS || \
496
+		   COMPILE_TEST
388497 	select WATCHDOG_CORE
389498 	select MFD_SYSCON if ARCH_EXYNOS
390499 	help
....@@ -442,7 +551,7 @@
442551 
443552 config PNX4008_WATCHDOG
444553 	tristate "LPC32XX Watchdog"
445
-	depends on ARCH_LPC32XX
554
+	depends on ARCH_LPC32XX || COMPILE_TEST
446555 	select WATCHDOG_CORE
447556 	help
448557 	  Say Y here if to include support for the watchdog timer
....@@ -480,6 +589,14 @@
480589 
481590 	  NOTE: once enabled, this timer cannot be disabled.
482591 	  Say N if you are unsure.
592
+
593
+config K3_RTI_WATCHDOG
594
+	tristate "Texas Instruments K3 RTI watchdog"
595
+	depends on ARCH_K3 || COMPILE_TEST
596
+	select WATCHDOG_CORE
597
+	help
598
+	  Say Y here if you want to include support for the K3 watchdog
599
+	  timer (RTI module) available in the K3 generation of processors.
483600 
484601 config ORION_WATCHDOG
485602 	tristate "Orion watchdog"
....@@ -525,9 +642,9 @@
525642 	  compiled as a module.
526643 
527644 config NPCM7XX_WATCHDOG
528
-	bool "Nuvoton NPCM750 watchdog"
645
+	tristate "Nuvoton NPCM750 watchdog"
529646 	depends on ARCH_NPCM || COMPILE_TEST
530
-	default y if ARCH_NPCM750
647
+	default y if ARCH_NPCM7XX
531648 	select WATCHDOG_CORE
532649 	help
533650 	  Say Y here to include Watchdog timer support for the
....@@ -553,15 +670,6 @@
553670 	  To compile this driver as a module, choose M here: the
554671 	  module will be called stmp3xxx_rtc_wdt.
555672 
556
-config NUC900_WATCHDOG
557
-	tristate "Nuvoton NUC900 watchdog"
558
-	depends on ARCH_W90X900 || COMPILE_TEST
559
-	help
560
-	  Say Y here if to include support for the watchdog timer
561
-	  for the Nuvoton NUC900 series SoCs.
562
-	  To compile this driver as a module, choose M here: the
563
-	  module will be called nuc900_wdt.
564
-
565673 config TS4800_WATCHDOG
566674 	tristate "TS-4800 Watchdog"
567675 	depends on HAS_IOMEM && OF
....@@ -576,6 +684,7 @@
576684 config TS72XX_WATCHDOG
577685 	tristate "TS-72XX SBC Watchdog"
578686 	depends on MACH_TS72XX || COMPILE_TEST
687
+	select WATCHDOG_CORE
579688 	help
580689 	  Technologic Systems TS-7200, TS-7250 and TS-7260 boards have
581690 	  watchdog timer implemented in a external CPLD chip. Say Y here
....@@ -614,6 +723,36 @@
614723 
615724 	  To compile this driver as a module, choose M here: the
616725 	  module will be called imx2_wdt.
726
+
727
+config IMX_SC_WDT
728
+	tristate "IMX SC Watchdog"
729
+	depends on HAVE_ARM_SMCCC
730
+	depends on IMX_SCU
731
+	select WATCHDOG_CORE
732
+	help
733
+	  This is the driver for the system controller watchdog
734
+	  on the NXP i.MX SoCs with system controller inside, the
735
+	  watchdog driver will call ARM SMC API and trap into
736
+	  ARM-Trusted-Firmware for operations, ARM-Trusted-Firmware
737
+	  will request system controller to execute the operations.
738
+	  If you have one of these processors and wish to have
739
+	  watchdog support enabled, say Y, otherwise say N.
740
+
741
+	  To compile this driver as a module, choose M here: the
742
+	  module will be called imx_sc_wdt.
743
+
744
+config IMX7ULP_WDT
745
+	tristate "IMX7ULP Watchdog"
746
+	depends on ARCH_MXC || COMPILE_TEST
747
+	select WATCHDOG_CORE
748
+	help
749
+	  This is the driver for the hardware watchdog on the Freescale
750
+	  IMX7ULP and later processors. If you have one of these
751
+	  processors and wish to have watchdog support enabled,
752
+	  say Y, otherwise say N.
753
+
754
+	  To compile this driver as a module, choose M here: the
755
+	  module will be called imx7ulp_wdt.
617756 
618757 config UX500_WATCHDOG
619758 	tristate "ST-Ericsson Ux500 watchdog"
....@@ -719,6 +858,7 @@
719858 	tristate "Mediatek SoCs watchdog support"
720859 	depends on ARCH_MEDIATEK || COMPILE_TEST
721860 	select WATCHDOG_CORE
861
+	select RESET_CONTROLLER
722862 	help
723863 	  Say Y here to include support for the watchdog timer
724864 	  in Mediatek SoCs.
....@@ -734,6 +874,19 @@
734874 	  in Conexant Digicolor SoCs.
735875 	  To compile this driver as a module, choose M here: the
736876 	  module will be called digicolor_wdt.
877
+
878
+config ARM_SMC_WATCHDOG
879
+	tristate "ARM Secure Monitor Call based watchdog support"
880
+	depends on ARM || ARM64
881
+	depends on OF
882
+	depends on HAVE_ARM_SMCCC
883
+	select WATCHDOG_CORE
884
+	help
885
+	  Say Y here to include support for a watchdog timer
886
+	  implemented by the EL3 Secure Monitor on ARM platforms.
887
+	  Requires firmware support.
888
+	  To compile this driver as a module, choose M here: the
889
+	  module will be called arm_smc_wdt.
737890 
738891 config LPC18XX_WATCHDOG
739892 	tristate "LPC18xx/43xx Watchdog"
....@@ -808,6 +961,18 @@
808961 	  To compile this driver as a module, choose M here: the
809962 	  module will be called stm32_iwdg.
810963 
964
+config STPMIC1_WATCHDOG
965
+	tristate "STPMIC1 PMIC watchdog support"
966
+	depends on MFD_STPMIC1
967
+	select WATCHDOG_CORE
968
+	help
969
+	  Say Y here to include watchdog support embedded into STPMIC1 PMIC.
970
+	  If the watchdog timer expires, stpmic1 will shut down all its power
971
+	  supplies.
972
+
973
+	  To compile this driver as a module, choose M here: the
974
+	  module will be called spmic1_wdt.
975
+
811976 config UNIPHIER_WATCHDOG
812977 	tristate "UniPhier watchdog support"
813978 	depends on ARCH_UNIPHIER || COMPILE_TEST
....@@ -838,12 +1003,28 @@
8381003 	  Say Y here to include watchdog timer supported
8391004 	  by Spreadtrum system.
8401005 
1006
+config PM8916_WATCHDOG
1007
+	tristate "QCOM PM8916 pmic watchdog"
1008
+	depends on OF && MFD_SPMI_PMIC
1009
+	select WATCHDOG_CORE
1010
+	help
1011
+	  Say Y here to include support watchdog timer embedded into the
1012
+	  pm8916 module.
1013
+
1014
+config VISCONTI_WATCHDOG
1015
+	tristate "Toshiba Visconti series watchdog support"
1016
+	depends on ARCH_VISCONTI || COMPILE_TEST
1017
+	select WATCHDOG_CORE
1018
+	help
1019
+	  Say Y here to include support for the watchdog timer in Toshiba
1020
+	  Visconti SoCs.
1021
+
8411022 # X86 (i386 + ia64 + x86_64) Architecture
8421023 
8431024 config ACQUIRE_WDT
8441025 	tristate "Acquire SBC Watchdog Timer"
8451026 	depends on X86
846
-	---help---
1027
+	help
8471028 	  This is the driver for the hardware watchdog on Single Board
8481029 	  Computers produced by Acquire Inc (and others). This watchdog
8491030 	  simply watches your kernel to make sure it doesn't freeze, and if
....@@ -861,12 +1042,12 @@
8611042 	  If you are configuring a Linux kernel for the Advantech single-board
8621043 	  computer, say `Y' here to support its built-in watchdog timer
8631044 	  feature. More information can be found at
864
-	  <http://www.advantech.com.tw/products/>
1045
+	  <https://www.advantech.com.tw/products/>
8651046 
8661047 config ALIM1535_WDT
8671048 	tristate "ALi M1535 PMU Watchdog Timer"
8681049 	depends on X86 && PCI
869
-	---help---
1050
+	help
8701051 	  This is the driver for the hardware watchdog on the ALi M1535 PMU.
8711052 
8721053 	  To compile this driver as a module, choose M here: the
....@@ -902,8 +1083,8 @@
9021083 	depends on X86
9031084 	help
9041085 	  This is the driver for the hardware watchdog on the Fintek F71808E,
905
-	  F71862FG, F71868, F71869, F71882FG, F71889FG, F81865 and F81866
906
-	  Super I/O controllers.
1086
+	  F71862FG, F71868, F71869, F71882FG, F71889FG, F81803, F81865, and
1087
+	  F81866 Super I/O controllers.
9071088 
9081089 	  You can compile this driver directly into the kernel, or use
9091090 	  it as a module.  The module will be called f71808e_wdt.
....@@ -912,7 +1093,7 @@
9121093 	tristate "AMD/ATI SP5100 TCO Timer/Watchdog"
9131094 	depends on X86 && PCI
9141095 	select WATCHDOG_CORE
915
-	---help---
1096
+	help
9161097 	  Hardware watchdog driver for the AMD/ATI SP5100 chipset. The TCO
9171098 	  (Total Cost of Ownership) timer is a watchdog timer that will reboot
9181099 	  the machine after its expiration. The expiration time can be
....@@ -950,7 +1131,7 @@
9501131 config SBC_FITPC2_WATCHDOG
9511132 	tristate "Compulab SBC-FITPC2 watchdog"
9521133 	depends on X86
953
-	---help---
1134
+	help
9541135 	  This is the driver for the built-in watchdog timer on the fit-PC2,
9551136 	  fit-PC2i, CM-iAM single-board computers made by Compulab.
9561137 
....@@ -980,7 +1161,7 @@
9801161 config IB700_WDT
9811162 	tristate "IB700 SBC Watchdog Timer"
9821163 	depends on X86
983
-	---help---
1164
+	help
9841165 	  This is the driver for the hardware watchdog on the IB700 Single
9851166 	  Board Computer produced by TMC Technology (www.tmc-uk.com). This watchdog
9861167 	  simply watches your kernel to make sure it doesn't freeze, and if
....@@ -1018,7 +1199,7 @@
10181199 	tristate "Intel 6300ESB Timer/Watchdog"
10191200 	depends on PCI
10201201 	select WATCHDOG_CORE
1021
-	---help---
1202
+	help
10221203 	  Hardware driver for the watchdog timer built into the Intel
10231204 	  6300ESB controller hub.
10241205 
....@@ -1031,7 +1212,7 @@
10311212 	select WATCHDOG_CORE
10321213 	select MFD_CORE
10331214 	select LPC_SCH
1034
-	---help---
1215
+	help
10351216 	  Hardware driver for the watchdog timer built into the Intel
10361217 	  Atom E6XX (TunnelCreek) processor.
10371218 
....@@ -1041,7 +1222,7 @@
10411222 config INTEL_SCU_WATCHDOG
10421223 	bool "Intel SCU Watchdog for Mobile Platforms"
10431224 	depends on X86_INTEL_MID
1044
-	---help---
1225
+	help
10451226 	  Hardware driver for the watchdog time built into the Intel SCU
10461227 	  for Intel Mobile Platforms.
10471228 
....@@ -1051,7 +1232,7 @@
10511232 	tristate "Intel MID Watchdog Timer"
10521233 	depends on X86_INTEL_MID
10531234 	select WATCHDOG_CORE
1054
-	---help---
1235
+	help
10551236 	  Watchdog timer driver built into the Intel SCU for Intel MID
10561237 	  Platforms.
10571238 
....@@ -1065,9 +1246,10 @@
10651246 	depends on (X86 || IA64) && PCI
10661247 	select WATCHDOG_CORE
10671248 	depends on I2C || I2C=n
1249
+	depends on MFD_INTEL_PMC_BXT || !MFD_INTEL_PMC_BXT
10681250 	select LPC_ICH if !EXPERT
10691251 	select I2C_I801 if !EXPERT && I2C
1070
-	---help---
1252
+	help
10711253 	  Hardware driver for the intel TCO timer based watchdog devices.
10721254 	  These drivers are included in the Intel 82801 I/O Controller
10731255 	  Hub family (from ICH0 up to ICH10) and in the Intel 63xxESB
....@@ -1088,7 +1270,7 @@
10881270 config ITCO_VENDOR_SUPPORT
10891271 	bool "Intel TCO Timer/Watchdog Specific Vendor Support"
10901272 	depends on ITCO_WDT
1091
-	---help---
1273
+	help
10921274 	  Add vendor specific support to the intel TCO timer based watchdog
10931275 	  devices. At this moment we only have additional support for some
10941276 	  SuperMicro Inc. motherboards.
....@@ -1096,7 +1278,7 @@
10961278 config IT8712F_WDT
10971279 	tristate "IT8712F (Smart Guardian) Watchdog Timer"
10981280 	depends on X86
1099
-	---help---
1281
+	help
11001282 	  This is the driver for the built-in watchdog timer on the IT8712F
11011283 	  Super I/0 chipset used on many motherboards.
11021284 
....@@ -1110,7 +1292,7 @@
11101292 	tristate "IT87 Watchdog Timer"
11111293 	depends on X86
11121294 	select WATCHDOG_CORE
1113
-	---help---
1295
+	help
11141296 	  This is the driver for the hardware watchdog on the ITE IT8607,
11151297 	  IT8620, IT8622, IT8625, IT8628, IT8655, IT8665, IT8686, IT8702,
11161298 	  IT8712, IT8716, IT8718, IT8720, IT8721, IT8726, IT8728, and
....@@ -1128,11 +1310,20 @@
11281310 	select WATCHDOG_CORE
11291311 	depends on X86 && PCI
11301312 	help
1131
-	  A software monitoring watchdog and NMI sourcing driver. This driver
1313
+	  A software monitoring watchdog and NMI handling driver. This driver
11321314 	  will detect lockups and provide a stack trace. This is a driver that
11331315 	  will only load on an HP ProLiant system with a minimum of iLO2 support.
11341316 	  To compile this driver as a module, choose M here: the module will be
11351317 	  called hpwdt.
1318
+
1319
+config HPWDT_NMI_DECODING
1320
+	bool "NMI support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
1321
+	depends on HP_WATCHDOG
1322
+	default y
1323
+	help
1324
+	  Enables the NMI handler for the watchdog pretimeout NMI and the iLO
1325
+	  "Generate NMI to System" virtual button.  When an NMI is claimed
1326
+	  by the driver, panic is called.
11361327 
11371328 config KEMPLD_WDT
11381329 	tristate "Kontron COM Watchdog Timer"
....@@ -1144,14 +1335,6 @@
11441335 
11451336 	  This driver can also be built as a module. If so, the module will be
11461337 	  called kempld_wdt.
1147
-
1148
-config HPWDT_NMI_DECODING
1149
-	bool "NMI decoding support for the HP ProLiant iLO2+ Hardware Watchdog Timer"
1150
-	depends on HP_WATCHDOG
1151
-	default y
1152
-	help
1153
-	  When an NMI occurs this feature will make the necessary BIOS calls to
1154
-	  log the cause of the NMI.
11551338 
11561339 config SC1200_WDT
11571340 	tristate "National Semiconductor PC87307/PC97307 (ala SC1200) Watchdog"
....@@ -1179,7 +1362,7 @@
11791362 config PC87413_WDT
11801363 	tristate "NS PC87413 watchdog"
11811364 	depends on X86
1182
-	---help---
1365
+	help
11831366 	  This is the driver for the hardware watchdog on the PC87413 chipset
11841367 	  This watchdog simply watches your kernel to make sure it doesn't
11851368 	  freeze, and if it does, it reboots your computer after a certain
....@@ -1193,7 +1376,7 @@
11931376 config NV_TCO
11941377 	tristate "nVidia TCO Timer/Watchdog"
11951378 	depends on X86 && PCI
1196
-	---help---
1379
+	help
11971380 	  Hardware driver for the TCO timer built into the nVidia Hub family
11981381 	  (such as the MCP51).  The TCO (Total Cost of Ownership) timer is a
11991382 	  watchdog timer that will reboot the machine after its second
....@@ -1236,7 +1419,7 @@
12361419 config SBC8360_WDT
12371420 	tristate "SBC8360 Watchdog Timer"
12381421 	depends on X86_32
1239
-	---help---
1422
+	help
12401423 
12411424 	  This is the driver for the hardware watchdog on the SBC8360 Single
12421425 	  Board Computer produced by Axiomtek Co., Ltd. (www.axiomtek.com).
....@@ -1249,7 +1432,7 @@
12491432 config SBC7240_WDT
12501433 	tristate "SBC Nano 7240 Watchdog Timer"
12511434 	depends on X86_32 && !UML
1252
-	---help---
1435
+	help
12531436 	  This is the driver for the hardware watchdog found on the IEI
12541437 	  single board computers EPIC Nano 7240 (and likely others). This
12551438 	  watchdog simply watches your kernel to make sure it doesn't freeze,
....@@ -1262,7 +1445,7 @@
12621445 config CPU5_WDT
12631446 	tristate "SMA CPU5 Watchdog"
12641447 	depends on X86
1265
-	---help---
1448
+	help
12661449 	  TBD.
12671450 	  To compile this driver as a module, choose M here: the
12681451 	  module will be called cpu5wdt.
....@@ -1270,7 +1453,7 @@
12701453 config SMSC_SCH311X_WDT
12711454 	tristate "SMSC SCH311X Watchdog Timer"
12721455 	depends on X86
1273
-	---help---
1456
+	help
12741457 	  This is the driver for the hardware watchdog timer on the
12751458 	  SMSC SCH3112, SCH3114 and SCH3116 Super IO chipset
12761459 	  (LPC IO with 8042 KBC, Reset Generation, HWM and multiple
....@@ -1282,7 +1465,7 @@
12821465 config SMSC37B787_WDT
12831466 	tristate "Winbond SMsC37B787 Watchdog Timer"
12841467 	depends on X86
1285
-	---help---
1468
+	help
12861469 	  This is the driver for the hardware watchdog component on the
12871470 	  Winbond SMsC37B787 chipset as used on the NetRunner Mainboard
12881471 	  from Vision Systems and maybe others.
....@@ -1299,11 +1482,24 @@
12991482 
13001483 	  Most people will say N.
13011484 
1485
+config TQMX86_WDT
1486
+	tristate "TQ-Systems TQMX86 Watchdog Timer"
1487
+	depends on X86
1488
+	select WATCHDOG_CORE
1489
+	help
1490
+	This is the driver for the hardware watchdog timer in the TQMX86 IO
1491
+	controller found on some of their ComExpress Modules.
1492
+
1493
+	To compile this driver as a module, choose M here; the module
1494
+	will be called tqmx86_wdt.
1495
+
1496
+	Most people will say N.
1497
+
13021498 config VIA_WDT
13031499 	tristate "VIA Watchdog Timer"
13041500 	depends on X86 && PCI
13051501 	select WATCHDOG_CORE
1306
-	---help---
1502
+	help
13071503 	This is the driver for the hardware watchdog timer on VIA
13081504 	southbridge chipset CX700, VX800/VX820 or VX855/VX875.
13091505 
....@@ -1316,7 +1512,7 @@
13161512 	tristate "Watchdog timer for W83627HF/W83627DHG and compatibles"
13171513 	depends on X86
13181514 	select WATCHDOG_CORE
1319
-	---help---
1515
+	help
13201516 	  This is the driver for the hardware watchdog on the following
13211517 	  Super I/O chips.
13221518 		W83627DHG/DHG-P/EHF/EHG/F/G/HF/S/SF/THF/UHG/UG
....@@ -1331,6 +1527,7 @@
13311527 		NCT6791
13321528 		NCT6792
13331529 		NCT6102D/04D/06D
1530
+		NCT6116D
13341531 
13351532 	  This watchdog simply watches your kernel to make sure it doesn't
13361533 	  freeze, and if it does, it reboots your computer after a certain
....@@ -1344,7 +1541,7 @@
13441541 config W83877F_WDT
13451542 	tristate "W83877F (EMACS) Watchdog Timer"
13461543 	depends on X86
1347
-	---help---
1544
+	help
13481545 	  This is the driver for the hardware watchdog on the W83877F chipset
13491546 	  as used in EMACS PC-104 motherboards (and likely others).  This
13501547 	  watchdog simply watches your kernel to make sure it doesn't freeze,
....@@ -1359,7 +1556,7 @@
13591556 config W83977F_WDT
13601557 	tristate "W83977F (PCM-5335) Watchdog Timer"
13611558 	depends on X86
1362
-	---help---
1559
+	help
13631560 	  This is the driver for the hardware watchdog on the W83977F I/O chip
13641561 	  as used in AAEON's PCM-5335 SBC (and likely others).  This
13651562 	  watchdog simply watches your kernel to make sure it doesn't freeze,
....@@ -1372,7 +1569,7 @@
13721569 config MACHZ_WDT
13731570 	tristate "ZF MachZ Watchdog"
13741571 	depends on X86
1375
-	---help---
1572
+	help
13761573 	  If you are using a ZF Micro MachZ processor, say Y here, otherwise
13771574 	  N.  This is the driver for the watchdog timer built-in on that
13781575 	  processor using ZF-Logic interface.  This watchdog simply watches
....@@ -1385,7 +1582,7 @@
13851582 config SBC_EPX_C3_WATCHDOG
13861583 	tristate "Winsystems SBC EPX-C3 watchdog"
13871584 	depends on X86
1388
-	---help---
1585
+	help
13891586 	  This is the driver for the built-in watchdog timer on the EPX-C3
13901587 	  Single-board computer made by Winsystems, Inc.
13911588 
....@@ -1407,7 +1604,7 @@
14071604 	tristate "Intel MEI iAMT Watchdog"
14081605 	depends on INTEL_MEI && X86
14091606 	select WATCHDOG_CORE
1410
-	---help---
1607
+	help
14111608 	  A device driver for the Intel MEI iAMT watchdog.
14121609 
14131610 	  The Intel AMT Watchdog is an OS Health (Hang/Crash) watchdog.
....@@ -1422,7 +1619,7 @@
14221619 	tristate "NI 903x/913x Watchdog"
14231620 	depends on X86 && ACPI
14241621 	select WATCHDOG_CORE
1425
-	---help---
1622
+	help
14261623 	  This is the driver for the watchdog timer on the National Instruments
14271624 	  903x/913x real-time controllers.
14281625 
....@@ -1433,7 +1630,7 @@
14331630 	tristate "NIC7018 Watchdog"
14341631 	depends on X86 && ACPI
14351632 	select WATCHDOG_CORE
1436
-	---help---
1633
+	help
14371634 	  Support for National Instruments NIC7018 Watchdog.
14381635 
14391636 	  To compile this driver as a module, choose M here: the module will be
....@@ -1487,8 +1684,10 @@
14871684 
14881685 config JZ4740_WDT
14891686 	tristate "Ingenic jz4740 SoC hardware watchdog"
1490
-	depends on MACH_JZ4740 || MACH_JZ4780
1687
+	depends on MIPS
1688
+	depends on COMMON_CLK
14911689 	select WATCHDOG_CORE
1690
+	select MFD_SYSCON
14921691 	help
14931692 	  Hardware driver for the built-in watchdog timer on Ingenic jz4740 SoCs.
14941693 
....@@ -1589,7 +1788,7 @@
15891788 
15901789 config BCM_KONA_WDT_DEBUG
15911790 	bool "DEBUGFS support for BCM Kona Watchdog"
1592
-	depends on BCM_KONA_WDT || COMPILE_TEST
1791
+	depends on BCM_KONA_WDT
15931792 	help
15941793 	  If enabled, adds /sys/kernel/debug/bcm_kona_wdt/info which provides
15951794 	  access to the driver's internal data structures as well as watchdog
....@@ -1623,6 +1822,7 @@
16231822 config LANTIQ_WDT
16241823 	tristate "Lantiq SoC watchdog"
16251824 	depends on LANTIQ
1825
+	select WATCHDOG_CORE
16261826 	help
16271827 	  Hardware driver for the Lantiq SoC Watchdog Timer.
16281828 
....@@ -1680,7 +1880,7 @@
16801880 config GEF_WDT
16811881 	tristate "GE Watchdog Timer"
16821882 	depends on GE_FPGA
1683
-	---help---
1883
+	help
16841884 	  Watchdog timer found in a number of GE single board computers.
16851885 
16861886 config MPC5200_WDT
....@@ -1718,11 +1918,11 @@
17181918 	tristate "PowerPC Book-E Watchdog Timer"
17191919 	depends on BOOKE || 4xx
17201920 	select WATCHDOG_CORE
1721
-	---help---
1921
+	help
17221922 	  Watchdog driver for PowerPC Book-E chips, such as the Freescale
17231923 	  MPC85xx SOCs and the IBM PowerPC 440.
17241924 
1725
-	  Please see Documentation/watchdog/watchdog-api.txt for
1925
+	  Please see Documentation/watchdog/watchdog-api.rst for
17261926 	  more information.
17271927 
17281928 config BOOKE_WDT_DEFAULT_TIMEOUT
....@@ -1809,7 +2009,7 @@
18092009 config WATCHDOG_CP1XXX
18102010 	tristate "CP1XXX Hardware Watchdog support"
18112011 	depends on SPARC64 && PCI
1812
-	---help---
2012
+	help
18132013 	  This is the driver for the hardware watchdog timers present on
18142014 	  Sun Microsystems CompactPCI models CP1400 and CP1500.
18152015 
....@@ -1866,12 +2066,12 @@
18662066 config PCWATCHDOG
18672067 	tristate "Berkshire Products ISA-PC Watchdog"
18682068 	depends on ISA
1869
-	---help---
2069
+	help
18702070 	  This is the driver for the Berkshire Products ISA-PC Watchdog card.
18712071 	  This card simply watches your kernel to make sure it doesn't freeze,
18722072 	  and if it does, it reboots your computer after a certain amount of
18732073 	  time. This driver is like the WDT501 driver but for different
1874
-	  hardware. Please read <file:Documentation/watchdog/pcwd-watchdog.txt>. The PC
2074
+	  hardware. Please read <file:Documentation/watchdog/pcwd-watchdog.rst>. The PC
18752075 	  watchdog cards can be ordered from <http://www.berkprod.com/>.
18762076 
18772077 	  To compile this driver as a module, choose M here: the
....@@ -1882,7 +2082,7 @@
18822082 config MIXCOMWD
18832083 	tristate "Mixcom Watchdog"
18842084 	depends on ISA
1885
-	---help---
2085
+	help
18862086 	  This is a driver for the Mixcom hardware watchdog cards.  This
18872087 	  watchdog simply watches your kernel to make sure it doesn't freeze,
18882088 	  and if it does, it reboots your computer after a certain amount of
....@@ -1896,7 +2096,7 @@
18962096 config WDT
18972097 	tristate "WDT Watchdog timer"
18982098 	depends on ISA
1899
-	---help---
2099
+	help
19002100 	  If you have a WDT500P or WDT501P watchdog board, say Y here,
19012101 	  otherwise N. It is not possible to probe for this board, which means
19022102 	  that you have to inform the kernel about the IO port and IRQ that
....@@ -1915,7 +2115,7 @@
19152115 config PCIPCWATCHDOG
19162116 	tristate "Berkshire Products PCI-PC Watchdog"
19172117 	depends on PCI
1918
-	---help---
2118
+	help
19192119 	  This is the driver for the Berkshire Products PCI-PC Watchdog card.
19202120 	  This card simply watches your kernel to make sure it doesn't freeze,
19212121 	  and if it does, it reboots your computer after a certain amount of
....@@ -1930,7 +2130,7 @@
19302130 config WDTPCI
19312131 	tristate "PCI-WDT500/501 Watchdog timer"
19322132 	depends on PCI
1933
-	---help---
2133
+	help
19342134 	  If you have a PCI-WDT500/501 watchdog board, say Y here, otherwise N.
19352135 
19362136 	  If you have a PCI-WDT501 watchdog board then you can enable the
....@@ -1953,7 +2153,7 @@
19532153 config USBPCWATCHDOG
19542154 	tristate "Berkshire Products USB-PC Watchdog"
19552155 	depends on USB
1956
-	---help---
2156
+	help
19572157 	  This is the driver for the Berkshire Products USB-PC Watchdog card.
19582158 	  This card simply watches your kernel to make sure it doesn't freeze,
19592159 	  and if it does, it reboots your computer after a certain amount of
....@@ -1964,55 +2164,5 @@
19642164 	  module will be called pcwd_usb.
19652165 
19662166 	  Most people will say N.
1967
-
1968
-comment "Watchdog Pretimeout Governors"
1969
-
1970
-config WATCHDOG_PRETIMEOUT_GOV
1971
-	bool "Enable watchdog pretimeout governors"
1972
-	depends on WATCHDOG_CORE
1973
-	help
1974
-	  The option allows to select watchdog pretimeout governors.
1975
-
1976
-if WATCHDOG_PRETIMEOUT_GOV
1977
-
1978
-choice
1979
-	prompt "Default Watchdog Pretimeout Governor"
1980
-	default WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
1981
-	help
1982
-	  This option selects a default watchdog pretimeout governor.
1983
-	  The governor takes its action, if a watchdog is capable
1984
-	  to report a pretimeout event.
1985
-
1986
-config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_NOOP
1987
-	bool "noop"
1988
-	select WATCHDOG_PRETIMEOUT_GOV_NOOP
1989
-	help
1990
-	  Use noop watchdog pretimeout governor by default. If noop
1991
-	  governor is selected by a user, write a short message to
1992
-	  the kernel log buffer and don't do any system changes.
1993
-
1994
-config WATCHDOG_PRETIMEOUT_DEFAULT_GOV_PANIC
1995
-	bool "panic"
1996
-	select WATCHDOG_PRETIMEOUT_GOV_PANIC
1997
-	help
1998
-	  Use panic watchdog pretimeout governor by default, if
1999
-	  a watchdog pretimeout event happens, consider that
2000
-	  a watchdog feeder is dead and reboot is unavoidable.
2001
-
2002
-endchoice
2003
-
2004
-config WATCHDOG_PRETIMEOUT_GOV_NOOP
2005
-	tristate "Noop watchdog pretimeout governor"
2006
-	help
2007
-	  Noop watchdog pretimeout governor, only an informational
2008
-	  message is added to kernel log buffer.
2009
-
2010
-config WATCHDOG_PRETIMEOUT_GOV_PANIC
2011
-	tristate "Panic watchdog pretimeout governor"
2012
-	help
2013
-	  Panic watchdog pretimeout governor, on watchdog pretimeout
2014
-	  event put the kernel into panic.
2015
-
2016
-endif # WATCHDOG_PRETIMEOUT_GOV
20172167 
20182168 endif # WATCHDOG