Pull watchdog updates and fixes from Guenter Roeck: "Subsystem: - Unregister PM notifier on watchdog unregister - Various documentation fixes and improvements Removed drivers: - Remove AMD Elan SC520 processor watchdog driver - Drop SMARC-sAM67 support - Remove driver for integrated WDT of ZFx86 486-based SoC New drivers: - Driver for Andes ATCWDT200 - Driver for Gunyah Watchdog Added support to existing drivers: - Add "apple,t8103-wdt" and "apple,t8122-wdt" compatibles to Apple watchdog driver - Add rockchip,rk3528-wdt and rockchip,rv1103b-wdt to snps,dw-wdt.yaml - Document IPQ9650, IPQ5210, Shikra, Nord, and Hawi in qcom-wdt.yaml Also document sram property and add support to get the bootstatus to qcom wdt driver - lenovo_se10_wdt: Fix use-after-rfree and add support for SE10 Gen 2 platform - ti,rti-wdt: Add ti,am62l-rti-wdt compatible - renesas: Document RZ/G3L support and rework example for renesas,r9a09g057-wdt Other bug fixes and improvements: - Use named initializers (sc1200, ziirave_wdt) - Allow pic32-dmt and pic32-wdt to be built with COMPILE_TEST - realtek-otto: enable clock before using I/O, and prevent PHASE2 underflows - rti_wdt: Add reaction control - renesas,rzn1-wdt: Drop interrupt support and other cleanup - gpio_wdt: Add ACPI support - imx7ulp_wdt: Keep WDOG running until A55 enters WFI on i.MX94 - sprd_wdt: Remove redundant sprd_wdt_disable() on register failure - bcm2835_wdt: Switch to new sys-off handler API - sama5d4_wdt: Fix WDDIS detection on SAM9X60 and SAMA7G5 - hpwdt: Refine hpwdt message for UV platform - Convert TS-4800 bindings to DT schema - menz069_wdt: drop unneeded MODULE_ALIAS - sp5100_tco: Use EFCH MMIO for newer Hygon FCH" * tag 'watchdog-for-v7.2' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging: (58 commits) watchdog: sc1200: Drop unused assignment of pnp_device_id driver data watchdog: unregister PM notifier on watchdog unregister dt-bindings: watchdog: qcom-wdt: Document IPQ5210 watchdog watchdog: dev: convert to kernel-doc comments watchdog: core: clean up some comments watchdog: uapi: add comments for what bit masks apply to watchdog: linux/watchdog.h: repair kernel-doc comments watchdog: add devm_watchdog_register_device() to watchdog-kernel-api watchdog: ziirave_wdt: Use named initializers for struct i2c_device_id watchdog: realtek-otto: enable clock before using I/O watchdog: realtek-otto: prevent PHASE2 underflows dt-bindings: watchdog: qcom-wdt: Document IPQ9650 watchdog dt-bindings: watchdog: renesas,rzn1-wdt: interrupts are not required dt-bindings: watchdog: apple,wdt: Add t8122 compatible watchdog: apple: Add "apple,t8103-wdt" compatible watchdog: rzn1: remove now obsolete interrupt support dt-bindings: watchdog: Add watchdog compatible for RK3528 watchdog: convert the Kconfig dependency on OF_GPIO to OF watchdog: Remove AMD Elan SC520 processor watchdog driver watchdog: lenovo_se10_wdt: Fix use-after-free and resource leak risk ...
Showing the changes to include/uapi/linux (1 of 45 files). Show all
Unified · Split
| @@ -36,6 +36,7 @@ struct watchdog_info { · 35 unmodified lines | ||
| 36 | 36 | #define WDIOF_UNKNOWN -1 /* Unknown flag error */ |
| 37 | 37 | #define WDIOS_UNKNOWN -1 /* Unknown status error */ |
| 38 | 38 | |
| 39 | +/* Bit masks for watchdog_info.options, GETSTATUS and GETBOOTSTATUS ioctls */ | |
| 39 | 40 | #define WDIOF_OVERHEAT 0x0001 /* Reset due to CPU overheat */ |
| 40 | 41 | #define WDIOF_FANFAULT 0x0002 /* Fan failed */ |
| 41 | 42 | #define WDIOF_EXTERN1 0x0004 /* External relay 1 */ |
| @@ -50,6 +51,7 @@ struct watchdog_info { · 8 unmodified lines | ||
| 50 | 51 | other external alarm not a reboot */ |
| 51 | 52 | #define WDIOF_KEEPALIVEPING 0x8000 /* Keep alive ping reply */ |
| 52 | 53 | |
| 54 | +/* Bit masks for WDIOC_SETOPTIONS ioctl */ | |
| 53 | 55 | #define WDIOS_DISABLECARD 0x0001 /* Turn off the watchdog timer */ |
| 54 | 56 | #define WDIOS_ENABLECARD 0x0002 /* Turn on the watchdog timer */ |
| 55 | 57 | #define WDIOS_TEMPPANIC 0x0004 /* Kernel panic on temperature trip */ |