Skip to contentSkip to conversation

watchdog: remove driver for integrated WDT of ZFx86 486-based SoC

PATCH In review Ethan Nelson-Moore 2 participants 5 messages Apr 28 – May 6

Subsystems (2)
lore
Share & tools
lore
#0 lore raw

PATCH 1/1 watchdog: remove driver for integrated WDT of ZFx86 486-based SoC

The machzwd driver supports the integrated watchdog of the ZF Micro ZFx86 SoC, which contains a 486-compatible core [1]. Since 486 support was removed in commit 8b793a92d862 ("x86/cpu: Remove M486/M486SX/ELAN support"), the driver is no longer useful, Remove it.

[1] https://www.zfmicro.com/zfx86.html

---
 .../watchdog/watchdog-parameters.rst          |  10 -
 drivers/watchdog/Kconfig                      |  13 -
 drivers/watchdog/Makefile                     |   1 -
 drivers/watchdog/machzwd.c                    | 452 ------------------
 4 files changed, 476 deletions(-)
 delete mode 100644 drivers/watchdog/machzwd.c
Documentation/watchdog/watchdog-parameters.rst +0 -10
index 773241ed9986..173adee71901 100644
@@ -284,16 +284,6 @@ ixp4xx_wdt:
 
 -------------------------------------------------
 
-machzwd:
-    nowayout:
-	Watchdog cannot be stopped once started
-	(default=kernel config parameter)
-    action:
-	after watchdog resets, generate:
-	0 = RESET(*)  1 = SMI  2 = NMI  3 = SCI
-
--------------------------------------------------
-
 max63xx_wdt:
     heartbeat:
 	Watchdog heartbeat period in seconds from 1 to 60, default 60
drivers/watchdog/Kconfig +0 -13
index dc78729ba2a5..97e320721cff 100644
@@ -1712,19 +1712,6 @@ config W83977F_WDT
 	  To compile this driver as a module, choose M here: the
 	  module will be called w83977f_wdt.
 
-config MACHZ_WDT
-	tristate "ZF MachZ Watchdog"
-	depends on (X86 || COMPILE_TEST) && HAS_IOPORT
-	help
-	  If you are using a ZF Micro MachZ processor, say Y here, otherwise
-	  N.  This is the driver for the watchdog timer built-in on that
-	  processor using ZF-Logic interface.  This watchdog simply watches
-	  your kernel to make sure it doesn't freeze, and if it does, it
-	  reboots your computer after a certain amount of time.
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called machzwd.
-
 config SBC_EPX_C3_WATCHDOG
 	tristate "Winsystems SBC EPX-C3 watchdog"
 	depends on (X86 || COMPILE_TEST) && HAS_IOPORT
drivers/watchdog/Makefile +0 -1
index d2fb16b9f9ce..2961ca141c61 100644
@@ -146,7 +146,6 @@ obj-$(CONFIG_VIA_WDT) += via_wdt.o
 obj-$(CONFIG_W83627HF_WDT) += w83627hf_wdt.o
 obj-$(CONFIG_W83877F_WDT) += w83877f_wdt.o
 obj-$(CONFIG_W83977F_WDT) += w83977f_wdt.o
-obj-$(CONFIG_MACHZ_WDT) += machzwd.o
 obj-$(CONFIG_SBC_EPX_C3_WATCHDOG) += sbc_epx_c3.o
 obj-$(CONFIG_INTEL_MID_WATCHDOG) += intel-mid_wdt.o
 obj-$(CONFIG_INTEL_OC_WATCHDOG) += intel_oc_wdt.o
drivers/watchdog/machzwd.c deleted +0 -452

452 lines not on this page · raw message

Signature · 1 line
2.43.0
maintainer Reviewed-by on v1 1/1
#1 lore raw
Quoted 8 lines · Ethan Nelson-Moore

The machzwd driver supports the integrated watchdog of the ZF Micro ZFx86 SoC, which contains a 486-compatible core [1]. Since 486 support was removed in commit 8b793a92d862 ("x86/cpu: Remove M486/M486SX/ELAN support"), the driver is no longer useful, Remove it.

[1] https://www.zfmicro.com/zfx86.html

#2 lore raw
In reply to Ethan Nelson-Moore
Quoted 4 lines · Ethan Nelson-Moore

The machzwd driver supports the integrated watchdog of the ZF Micro ZFx86 SoC, which contains a 486-compatible core [1]. Since 486 support was removed in commit 8b793a92d862 ("x86/cpu: Remove M486/M486SX/ELAN support"), the driver is no longer useful, Remove it.

Hi, Guenter,

Would you be willing to merge this patch? Unlike the other drivers whose removal I proposed, this one can't be used at all now that 486 support is gone from the kernel - no other hardware contains this WDT.

Ethan

maintainer
#3 lore raw
Quoted 7 lines · Ethan Nelson-Moore
Quoted 4 lines · Ethan Nelson-Moore

The machzwd driver supports the integrated watchdog of the ZF Micro ZFx86 SoC, which contains a 486-compatible core [1]. Since 486 support was removed in commit 8b793a92d862 ("x86/cpu: Remove M486/M486SX/ELAN support"), the driver is no longer useful, Remove it.

Quoted 6 lines

Hi, Guenter,

Would you be willing to merge this patch? Unlike the other drivers whose removal I proposed, this one can't be used at all now that 486 support is gone from the kernel - no other hardware contains this WDT.

Already done.

Guenter