Skip to contentSkip to conversation

PATCH: mv64x60: add watchdog support

PATCH James Chapman 2 participants 2 messages Feb 24, 2005 – Feb 28, 2005 2 messages not in the archive Char and misc drivers

lore
Share & tools
lore

A message that is not in the archive (sent off-list or not yet received): [email protected]

A message that is not in the archive (sent off-list or not yet received): [email protected]

#2 lore raw

Wim,

Please review this patch that adds mv64x60 watchdog support.

I'm cc'ing linuxppc-embedded to get critical review from developers who are more likely to know this chip. The Marvell mv64x60 chips are found on ppc and mips boards.

/james

Quoted 7 lines · Wim Van Sebroeck

Hi James,

Quoted 3 lines

Are you the Linux watchdog driver maintainer? I have a patch for a new watchdog driver for Marvell Discovery (mv64x60) boards and I'm trying to find the best place to post it...

My patch is against the latest 2.6 bk tree. Should I create the patch against a different tree? Is there a mailing list?

Quoted 6 lines

You can sent it to me and I'll review it and include it in the linux-watchdog bitkeeper tree. We actually work first with the -mm tree for testing, after that it goes to linus.

Hope this helps,
Greetings,
wim.

# This is a BitKeeper generated diff -Nru style patch. #
# ChangeSet
# 2005/02/24 10:40:40+00:00 [email protected]
# Add mv64x60 (Marvell Discovery) watchdog support.
#

# drivers/char/watchdog/mv64x60_wdt.c
#   2005/02/24 10:40:31+00:00 [email protected] +252 -0
# 
# include/asm-ppc/mv64x60.h
#   2005/02/24 10:40:31+00:00 [email protected] +8 -0
#   Add mv64x60 (Marvell Discovery) watchdog support.
# 
# drivers/char/watchdog/mv64x60_wdt.c
#   2005/02/24 10:40:31+00:00 [email protected] +0 -0
#   BitKeeper file /home/james/bk/linux-2.6.wdt/drivers/char/watchdog/mv64x60_wdt.c
# 
# drivers/char/watchdog/Makefile
#   2005/02/24 10:40:31+00:00 [email protected] +1 -0
#   Add mv64x60 (Marvell Discovery) watchdog support.
# 
# drivers/char/watchdog/Kconfig
#   2005/02/24 10:40:31+00:00 [email protected] +4 -0
#   Add mv64x60 (Marvell Discovery) watchdog support.
# 
diff -Nru a/drivers/char/watchdog/Kconfig b/drivers/char/watchdog/Kconfig
--- a/drivers/char/watchdog/Kconfig	2005-02-24 10:45:36 +00:00
+++ b/drivers/char/watchdog/Kconfig	2005-02-24 10:45:36 +00:00
@@ -346,6 +346,10 @@
 	tristate "MPC8xx Watchdog Timer"
 	depends on WATCHDOG && 8xx

+config MV64X60_WDT
+ tristate "MV64X60 (Marvell Discovery) Watchdog Timer"
+ depends on WATCHDOG && MV64X60
+
# MIPS Architecture

config INDYDOG

drivers/char/watchdog/Makefile +1 -0
diff -Nru a/drivers/char/watchdog/Makefile b/drivers/char/watchdog/Makefile
@@ -39,3 +39,4 @@
 obj-$(CONFIG_IXP4XX_WATCHDOG) += ixp4xx_wdt.o
 obj-$(CONFIG_IXP2000_WATCHDOG) += ixp2000_wdt.o
 obj-$(CONFIG_8xx_WDT) += mpc8xx_wdt.o
+obj-$(CONFIG_MV64X60_WDT) += mv64x60_wdt.o
drivers/char/watchdog/mv64x60_wdt.c new file +252 -0

252 lines not on this page · raw message

include/asm-ppc/mv64x60.h +8 -0
diff -Nru a/include/asm-ppc/mv64x60.h b/include/asm-ppc/mv64x60.h
@@ -119,6 +119,14 @@
 
 #define	MV64x60_64BIT_WIN_COUNT			24
 
+/* Watchdog Platform Device, Driver Data */
+#define	MV64x60_WDT_NAME			"wdt"
+
+struct mv64x60_wdt_pdata {
+	int	timeout;	/* watchdog expiry in seconds, default 10 */
+	int	bus_clk;	/* bus clock in MHz, default 133 */
+};
+
 /*
  * Define a structure that's used to pass in config information to the
  * core routines.
#3 lore raw
Quoted 11 lines · James Chapman

Wim,

Please review this patch that adds mv64x60 watchdog support.

I'm cc'ing linuxppc-embedded to get critical review from developers who are more likely to know this chip. The Marvell mv64x60 chips are found on ppc and mips boards.

/james

FWIW, this looks fine to me.

Mark