Skip to contentSkip to conversation

the scheduled removal of the i8xx_tco watchdog driver

PATCH In review Adrian Bunk 2 participants 4 messages Apr 6, 2007 – Apr 29, 2007

Subsystems (2)
Documentation Char and misc drivers
lore
Share & tools
lore

Adrian Bunk

author
#0 lore raw

PATCH 1/1 the scheduled removal of the i8xx_tco watchdog driver

This patch contains the scheduled removal of the i8xx_tco watchdog driver.

Signed-off-by Adrian Bunk <[email protected]>

---

 Documentation/feature-removal-schedule.txt |    8 
 MAINTAINERS                                |    6 
 drivers/char/watchdog/Kconfig              |   22 
 drivers/char/watchdog/Makefile             |    1 
 drivers/char/watchdog/i8xx_tco.c           |  571 ---------------------
 drivers/char/watchdog/i8xx_tco.h           |   42 -
 6 files changed, 650 deletions(-)
Documentation/feature-removal-schedule.txt renamed from Documentation/feature-removal-schedule.txt.old +0 -8
@@ -235,14 +235,6 @@ Who:	Richard Purdie <[email protected]>
 
 ---------------------------
 
-What:	i8xx_tco watchdog driver
-When:	in 2.6.22
-Why:	the i8xx_tco watchdog driver has been replaced by the iTCO_wdt
-	watchdog driver.
-Who:	Wim Van Sebroeck <[email protected]>
-
----------------------------
-
 What:	i2c-rpx driver
 When:	June 2007
 Why:	Broken. It depends on i2c-algo-8xx which has never been in the
MAINTAINERS renamed from MAINTAINERS.old +0 -6
@@ -1690,12 +1690,6 @@ P:	H. Peter Anvin
 M:	[email protected]
 S:	Maintained
 
-i810 TCO TIMER WATCHDOG
-P:	Nils Faerber
-M:	[email protected]
-W:	http://www.kernelconcepts.de/
-S:	Maintained
-
 IA64 (Itanium) PLATFORM
 P:	Tony Luck
 M:	[email protected]
drivers/char/watchdog/Kconfig renamed from drivers/char/watchdog/Kconfig.old +0 -22
@@ -298,28 +298,6 @@ config I6300ESB_WDT
 	  To compile this driver as a module, choose M here: the
 	  module will be called i6300esb.
 
-config I8XX_TCO
-	tristate "Intel i8xx TCO Timer/Watchdog"
-	depends on WATCHDOG && (X86 || IA64) && PCI
-	default n
-	---help---
-	  Hardware driver for the TCO timer built into the Intel 82801
-	  I/O Controller Hub family.  The TCO (Total Cost of Ownership)
-	  timer is a watchdog timer that will reboot the machine after
-	  its second expiration. The expiration time can be configured
-	  with the "heartbeat" parameter.
-
-	  On some motherboards the driver may fail to reset the chipset's
-	  NO_REBOOT flag which prevents the watchdog from rebooting the
-	  machine. If this is the case you will get a kernel message like
-	  "failed to reset NO_REBOOT flag, reboot disabled by hardware".
-
-	  To compile this driver as a module, choose M here: the
-	  module will be called i8xx_tco.
-
-	  Note: This driver will be removed in the near future. Please
-	  use the Intel TCO Timer/Watchdog driver.
-
 config ITCO_WDT
 	tristate "Intel TCO Timer/Watchdog"
 	depends on WATCHDOG && (X86 || IA64) && PCI
drivers/char/watchdog/Makefile renamed from drivers/char/watchdog/Makefile.old +0 -1
@@ -46,7 +46,6 @@ obj-$(CONFIG_IB700_WDT) += ib700wdt.o
 obj-$(CONFIG_IBMASR) += ibmasr.o
 obj-$(CONFIG_WAFER_WDT) += wafer5823wdt.o
 obj-$(CONFIG_I6300ESB_WDT) += i6300esb.o
-obj-$(CONFIG_I8XX_TCO) += i8xx_tco.o
 obj-$(CONFIG_ITCO_WDT) += iTCO_wdt.o iTCO_vendor_support.o
 obj-$(CONFIG_SC1200_WDT) += sc1200wdt.o
 obj-$(CONFIG_SCx200_WDT) += scx200_wdt.o
drivers/char/watchdog/i8xx_tco.h deleted +0 -42

42 lines not on this page · raw message

drivers/char/watchdog/i8xx_tco.c deleted +0 -571

571 lines not on this page · raw message

#1 lore raw

Hello Adrian,

Quoted 4 lines

This patch contains the scheduled removal of the i8xx_tco watchdog driver.

Signed-off-by Adrian Bunk <[email protected]>

Signed-off-by me also.

We probably also need to remove some stuff in the Documentation/watchdog files.

Greetings,
Wim.

author
#2 lore raw
Quoted 10 lines · Wim Van Sebroeck

Hello Adrian,

Quoted 4 lines

This patch contains the scheduled removal of the i8xx_tco watchdog driver.

Signed-off-by Adrian Bunk <[email protected]>

Signed-off-by me also.

We probably also need to remove some stuff in the Documentation/watchdog files.

I might be blind, but I'm not seeing what should be removed.

Quoted 2 lines

Greetings,
Wim.

cu
Adrian

Signature · 4 lines
       "Is there not promise of rain?" Ling Tan asked suddenly out
        of the darkness. There had been need of rain for many days.
       "Only a promise," Lao Er said.
                                       Pearl S. Buck - Dragon Seed
#3 lore raw

Hi Adrian,

Quoted 1 line

I might be blind, but I'm not seeing what should be removed.

[wim@infomag linux-2.6]$ grep -i tco Documentation/watchdog/* Documentation/watchdog/watchdog-api.txt:i810-tco.c -- Intel 810 chipset Documentation/watchdog/watchdog.txt:The i810 TCO watchdog modules can be configured with the "i810_margin" Documentation/watchdog/watchdog.txt:The i810 TCO watchdog driver also implements the WDIOC_GETSTATUS and Documentation/watchdog/watchdog.txt:and WDIOC_GETBOOTSTATUS returns the value of TCO2 Status Register (see Intel's
Documentation/watchdog/watchdog.txt: WDT501P WDT500P Software Berkshire i810 TCO SA1100WD

But I need to clean this up anyway. So no real need to put this in the same patch yet. I'll create a new patch for this that deals with the complete watchdog Documentation.

Greetings,
Wim.