Skip to contentSkip to conversation

watchdog: Convert orion_wdt driver to watchdog core

PATCH In review Axel Lin 2 participants 5 messages Mar 26, 2012 – May 10, 2012 Watchdog device drivers

lore
Share & tools
lore

Axel Lin

author
#0 lore raw

PATCH v3 1/1 watchdog: Convert orion_wdt driver to watchdog core

Convert orion_wdt driver to use watchdog framework API.

---
Hi Jason, Andrew,
I don't have this hardware handy.
I'd appreciate if you can review and test this patch.

Thanks,
Axel
v3: Base on Jason's comment, platform data is changing soon with devicetree
support, so I don't change the coding style for getting tclk from pdata. I keep the whitespace change for WDT_EN in this version, as it makes the code looks better and I don't think it worth to send a separate patch for fixing a whilespace.
v2: v1 does not apply to current tree. so I re-generate this patch.

 drivers/watchdog/Kconfig     |    1 +
 drivers/watchdog/orion_wdt.c |  193 ++++++++++--------------------------------
 2 files changed, 46 insertions(+), 148 deletions(-)
drivers/watchdog/Kconfig +1 -0
index 3709624..db7aeeb 100644
@@ -277,6 +277,7 @@ config DAVINCI_WATCHDOG
 config ORION_WATCHDOG
 	tristate "Orion watchdog"
 	depends on ARCH_ORION5X || ARCH_KIRKWOOD
+	select WATCHDOG_CORE
 	help
 	  Say Y here if to include support for the watchdog timer
 	  in the Marvell Orion5x and Kirkwood ARM SoCs.
drivers/watchdog/orion_wdt.c +45 -148

281 lines not on this page · raw message

Signature · 1 line
1.7.5.4
#1 lore raw
Quoted 7 lines · Axel Lin

Convert orion_wdt driver to use watchdog framework API.

---
Hi Jason, Andrew,
I don't have this hardware handy.
I'd appreciate if you can review and test this patch.

Axel,

Sorry for the delay, been a busy week. I'm getting the following error:

drivers/watchdog/orion_wdt.c:133:2: error: unknown field 'get_timeleft' specified in initializer
drivers/watchdog/orion_wdt.c:133:2: warning: initialization from incompatible pointer type

What tag did you base this off of? Are there any dependencies not in mainline?

I based off of v3.3 with the following merged:

git://git.infradead.org/users/jcooper/linux-kirkwood.git kirkwood_dt_for_3.4_v3

thx,

Jason.

author
#2 lore raw

2012/3/31 Jason Cooper <[email protected]>:

Quoted 13 lines · Axel Lin
Quoted 7 lines

Convert orion_wdt driver to use watchdog framework API.

---
Hi Jason, Andrew,
I don't have this hardware handy.
I'd appreciate if you can review and test this patch.

Axel,

Sorry for the delay, been a busy week.  I'm getting the following error:

Quoted 7 lines

drivers/watchdog/orion_wdt.c:133:2: error: unknown field 'get_timeleft' specified in initializer
drivers/watchdog/orion_wdt.c:133:2: warning: initialization from incompatible pointer type

What tag did you base this off of?  Are there any dependencies not in mainline?

I generate the patch base on linux-next tree.
I just checked Linus' tree and this patch is appliable to Linus' tree. The required commit[1] is alread merged to Linus' tree now. Can you check it again?
Thanks.

[1] http://www.linux-watchdog.org/cgi-bin/gitweb.cgi?p=linux-watchdog.git;a=commitdiff;h=fd7b673c92731fc6c0b1e999adfd87b6762ee797
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in
the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

#3 lore raw
Quoted 19 lines · Axel Lin

2012/3/31 Jason Cooper <[email protected]>:

Quoted 18 lines · Axel Lin
Quoted 7 lines

Convert orion_wdt driver to use watchdog framework API.

---
Hi Jason, Andrew,
I don't have this hardware handy.
I'd appreciate if you can review and test this patch.

Axel,

Sorry for the delay, been a busy week.  I'm getting the following error:

drivers/watchdog/orion_wdt.c:133:2: error: unknown field 'get_timeleft' specified in initializer
drivers/watchdog/orion_wdt.c:133:2: warning: initialization from incompatible pointer type

Quoted 7 lines
Quoted 2 lines

What tag did you base this off of?  Are there any dependencies not in mainline?

I generate the patch base on linux-next tree.
I just checked Linus' tree and this patch is appliable to Linus' tree. The required commit[1] is alread merged to Linus' tree now. Can you check it again?
Thanks.

Ah, much better. I rebased it against v3.4-rc1 now that it's out. Compiles without problems. I'll test this weekend most likely. I don't have my watchdog code in front of me atm.

thx,

Jason.

Quoted 1 line

[1] http://www.linux-watchdog.org/cgi-bin/gitweb.cgi?p=linux-watchdog.git;a=commitdiff;h=fd7b673c92731fc6c0b1e999adfd87b6762ee797

--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html

author
#4 lore raw
Quoted 4 lines

Ah, much better.  I rebased it against v3.4-rc1 now that it's out. Compiles without problems.  I'll test this weekend most likely.  I don't have my watchdog code in front of me atm.

Hi Jason,
Does this patch work for you?

Thanks,
Axel
--
To unsubscribe from this list: send the line "unsubscribe linux-watchdog" in the body of a message to [email protected]
More majordomo info at http://vger.kernel.org/majordomo-info.html