Skip to content

Commit 6e63a3a

Browse files
vireshkWim Van Sebroeck
authored and
Wim Van Sebroeck
committed
watchdog: delete mpcore_wdt driver
Interrupt request doesn't use the right API: The TWD watchdog uses a per-cpu interrupt (usually interrupt #30), and the GIC configuration should flag it as such. With this setup, request_irq() should fail, and the right API is request_percpu_irq(), together with enable_percpu_irq()/disable_percpu_irq(). Nothing ensures the userspace ioctl() will end-up kicking the watchdog on the right CPU. There are no users of this driver since a long time and it makes more sense to get rid of it as nobody is looking to fix it. In case somebody wakes up after this has been removed and needs it, please revert this driver and pick these updates (These were never pushed to mainline): http://comments.gmane.org/gmane.linux.ports.arm.kernel/245998 Signed-off-by: Viresh Kumar <[email protected]> Acked-by: Guenter Roeck <[email protected]> Signed-off-by: Wim Van Sebroeck <[email protected]>
1 parent 8fce9b3 commit 6e63a3a

File tree

5 files changed

+0
-473
lines changed

5 files changed

+0
-473
lines changed

Documentation/watchdog/watchdog-parameters.txt

Lines changed: 0 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -194,14 +194,6 @@ reset: Watchdog Interrupt/Reset Mode. 0 = interrupt, 1 = reset
194194
nowayout: Watchdog cannot be stopped once started
195195
(default=kernel config parameter)
196196
-------------------------------------------------
197-
mpcore_wdt:
198-
mpcore_margin: MPcore timer margin in seconds.
199-
(0 < mpcore_margin < 65536, default=60)
200-
nowayout: Watchdog cannot be stopped once started
201-
(default=kernel config parameter)
202-
mpcore_noboot: MPcore watchdog action, set to 1 to ignore reboots,
203-
0 to reboot (default=0
204-
-------------------------------------------------
205197
mv64x60_wdt:
206198
nowayout: Watchdog cannot be stopped once started
207199
(default=kernel config parameter)

arch/arm/configs/spear13xx_defconfig

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -61,7 +61,6 @@ CONFIG_GPIO_SYSFS=y
6161
CONFIG_GPIO_PL061=y
6262
# CONFIG_HWMON is not set
6363
CONFIG_WATCHDOG=y
64-
CONFIG_MPCORE_WATCHDOG=y
6564
# CONFIG_HID_SUPPORT is not set
6665
CONFIG_USB=y
6766
# CONFIG_USB_DEVICE_CLASS is not set

drivers/watchdog/Kconfig

Lines changed: 0 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -221,15 +221,6 @@ config DW_WATCHDOG
221221
To compile this driver as a module, choose M here: the
222222
module will be called dw_wdt.
223223

224-
config MPCORE_WATCHDOG
225-
tristate "MPcore watchdog"
226-
depends on HAVE_ARM_TWD
227-
help
228-
Watchdog timer embedded into the MPcore system.
229-
230-
To compile this driver as a module, choose M here: the
231-
module will be called mpcore_wdt.
232-
233224
config EP93XX_WATCHDOG
234225
tristate "EP93xx Watchdog"
235226
depends on ARCH_EP93XX

drivers/watchdog/Makefile

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -41,7 +41,6 @@ obj-$(CONFIG_KS8695_WATCHDOG) += ks8695_wdt.o
4141
obj-$(CONFIG_S3C2410_WATCHDOG) += s3c2410_wdt.o
4242
obj-$(CONFIG_SA1100_WATCHDOG) += sa1100_wdt.o
4343
obj-$(CONFIG_DW_WATCHDOG) += dw_wdt.o
44-
obj-$(CONFIG_MPCORE_WATCHDOG) += mpcore_wdt.o
4544
obj-$(CONFIG_EP93XX_WATCHDOG) += ep93xx_wdt.o
4645
obj-$(CONFIG_PNX4008_WATCHDOG) += pnx4008_wdt.o
4746
obj-$(CONFIG_IOP_WATCHDOG) += iop_wdt.o

0 commit comments

Comments
 (0)