Skip to contentSkip to conversation

mpc52xx/wdt: merge WDT code into the GPT driver

PATCH In review Albrecht Dreß 2 participants 2 messages Nov 12, 2009

Subsystems (2)
PowerPC Linux for PowerPC embedded MPC5XXX
lore
Share & tools
lore

Albrecht Dreß

author
#0 lore raw

PATCH v2 2/3 mpc52xx/wdt: merge WDT code into the GPT driver

Merge the WDT code into the GPT interface.

Signed-off-by Albrecht Dreß <[email protected]>

---

Change against v1: fully merge the wdt api into this file.
Note: The patch does also include the tiny GPT api changes from
<http://lists.ozlabs.org/pipermail/linuxppc-dev/2009-November/077647.html>.

 arch/powerpc/include/asm/mpc52xx.h        |    5 +-
 arch/powerpc/platforms/52xx/mpc52xx_gpt.c |  328 +++++++++++++++++++++++++++--
 2 files changed, 312 insertions(+), 21 deletions(-)
arch/powerpc/include/asm/mpc52xx.h +3 -2
index 707ab75..b664ce7 100644
@@ -279,9 +279,10 @@ extern void mpc52xx_restart(char *cmd);
 /* mpc52xx_gpt.c */
 struct mpc52xx_gpt_priv;
 extern struct mpc52xx_gpt_priv *mpc52xx_gpt_from_irq(int irq);
-extern int mpc52xx_gpt_start_timer(struct mpc52xx_gpt_priv *gpt, int period,
+extern int mpc52xx_gpt_start_timer(struct mpc52xx_gpt_priv *gpt, u64 period,
                             int continuous);
-extern void mpc52xx_gpt_stop_timer(struct mpc52xx_gpt_priv *gpt);
+extern u64 mpc52xx_gpt_timer_period(struct mpc52xx_gpt_priv *gpt);
+extern int mpc52xx_gpt_stop_timer(struct mpc52xx_gpt_priv *gpt);
 
 /* mpc52xx_lpbfifo.c */
 #define MPC52XX_LPBFIFO_FLAG_READ		(0)
arch/powerpc/platforms/52xx/mpc52xx_gpt.c +309 -19

416 lines not on this page · raw message