Skip to content

Commit

Permalink
watchdog: Remove MV64x60 watchdog driver
Browse files Browse the repository at this point in the history
Commit 92c8c16 ("powerpc/embedded6xx: Remove C2K board support")
removed the last selector of CONFIG_MV64X60.

Therefore CONFIG_MV64X60_WDT cannot be selected anymore and
can be removed.

Signed-off-by: Christophe Leroy <christophe.leroy@csgroup.eu>
Reviewed-by: Guenter Roeck <linux@roeck-us.net>
Link: https://lore.kernel.org/r/9c2952bcfaec3b1789909eaa36bbce2afbfab7ab.1616085654.git.christophe.leroy@csgroup.eu
Signed-off-by: Guenter Roeck <linux@roeck-us.net>
Signed-off-by: Wim Van Sebroeck <wim@linux-watchdog.org>
  • Loading branch information
Christophe Leroy authored and Wim Van Sebroeck committed Jun 21, 2021
1 parent 5f8ebd4 commit bc65baf
Show file tree
Hide file tree
Showing 4 changed files with 0 additions and 337 deletions.
4 changes: 0 additions & 4 deletions drivers/watchdog/Kconfig
Original file line number Diff line number Diff line change
Expand Up @@ -1849,10 +1849,6 @@ config 8xxx_WDT

For BookE processors (MPC85xx) use the BOOKE_WDT driver instead.

config MV64X60_WDT
tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
depends on MV64X60 || COMPILE_TEST

config PIKA_WDT
tristate "PIKA FPGA Watchdog"
depends on WARP || (PPC64 && COMPILE_TEST)
Expand Down
1 change: 0 additions & 1 deletion drivers/watchdog/Makefile
Original file line number Diff line number Diff line change
Expand Up @@ -175,7 +175,6 @@ obj-$(CONFIG_PIC32_DMT) += pic32-dmt.o
# POWERPC Architecture
obj-$(CONFIG_GEF_WDT) += gef_wdt.o
obj-$(CONFIG_8xxx_WDT) += mpc8xxx_wdt.o
obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
obj-$(CONFIG_PIKA_WDT) += pika_wdt.o
obj-$(CONFIG_BOOKE_WDT) += booke_wdt.o
obj-$(CONFIG_MEN_A21_WDT) += mena21_wdt.o
Expand Down
324 changes: 0 additions & 324 deletions drivers/watchdog/mv64x60_wdt.c

This file was deleted.

8 changes: 0 additions & 8 deletions include/linux/mv643xx.h
Original file line number Diff line number Diff line change
Expand Up @@ -918,12 +918,4 @@

extern void mv64340_irq_init(unsigned int base);

/* Watchdog Platform Device, Driver Data */
#define MV64x60_WDT_NAME "mv64x60_wdt"

struct mv64x60_wdt_pdata {
int timeout; /* watchdog expiry in seconds, default 10 */
int bus_clk; /* bus clock in MHz, default 133 */
};

#endif /* __ASM_MV643XX_H */

0 comments on commit bc65baf

Please sign in to comment.