Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit a3e0316c authored by H Hartley Sweeten's avatar H Hartley Sweeten Committed by Greg Kroah-Hartman
Browse files

staging: comedi: addi_watchdog: use addi_tcw.h defines for watchdog 



Use the generic TCW (timer/counter/watchdog) defines for the 8-bit watchdog.

Signed-off-by: default avatarH Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: default avatarIan Abbott <abbotti@mev.co.uk>
Signed-off-by: default avatarGreg Kroah-Hartman <gregkh@linuxfoundation.org>
parent e8dbe0c4

drivers/staging/comedi/drivers/addi_watchdog.c

+9 −21
Original line number Diff line number Diff line
@@ -20,21 +20,9 @@ 


#include <linux/module.h>

#include "../comedidev.h"

#include "addi_tcw.h"

#include "addi_watchdog.h"



/*

 * Register offsets/defines for the addi-data watchdog

 */

#define ADDI_WDOG_REG			0x00

#define ADDI_WDOG_RELOAD_REG		0x04

#define ADDI_WDOG_TIMEBASE		0x08

#define ADDI_WDOG_CTRL_REG		0x0c

#define ADDI_WDOG_CTRL_ENABLE		(1 << 0)

#define ADDI_WDOG_CTRL_SW_TRIG		(1 << 9)

#define ADDI_WDOG_STATUS_REG		0x10

#define ADDI_WDOG_STATUS_ENABLED	(1 << 0)

#define ADDI_WDOG_STATUS_SW_TRIG	(1 << 1)



struct addi_watchdog_private {

	unsigned long iobase;

	unsigned int wdog_ctrl;
@@ -60,9 +48,9 @@ static int addi_watchdog_insn_config(struct comedi_device *dev, 


	switch (data[0]) {

	case INSN_CONFIG_ARM:

		spriv->wdog_ctrl = ADDI_WDOG_CTRL_ENABLE;

		spriv->wdog_ctrl = ADDI_TCW_CTRL_ENA;

		reload = data[1] & s->maxdata;

		outl(reload, spriv->iobase + ADDI_WDOG_RELOAD_REG);

		outl(reload, spriv->iobase + ADDI_TCW_RELOAD_REG);



		/* Time base is 20ms, let the user know the timeout */

		dev_info(dev->class_dev, "watchdog enabled, timeout:%dms\n",
@@ -75,7 +63,7 @@ static int addi_watchdog_insn_config(struct comedi_device *dev, 
		return -EINVAL;

	}



	outl(spriv->wdog_ctrl, spriv->iobase + ADDI_WDOG_CTRL_REG);

	outl(spriv->wdog_ctrl, spriv->iobase + ADDI_TCW_CTRL_REG);



	return insn->n;

}
@@ -89,7 +77,7 @@ static int addi_watchdog_insn_read(struct comedi_device *dev, 
	int i;



	for (i = 0; i < insn->n; i++)

		data[i] = inl(spriv->iobase + ADDI_WDOG_STATUS_REG);

		data[i] = inl(spriv->iobase + ADDI_TCW_STATUS_REG);



	return insn->n;

}
@@ -109,8 +97,8 @@ static int addi_watchdog_insn_write(struct comedi_device *dev, 


	/* "ping" the watchdog */

	for (i = 0; i < insn->n; i++) {

		outl(spriv->wdog_ctrl | ADDI_WDOG_CTRL_SW_TRIG,

		     spriv->iobase + ADDI_WDOG_CTRL_REG);

		outl(spriv->wdog_ctrl | ADDI_TCW_CTRL_TRIG,

		     spriv->iobase + ADDI_TCW_CTRL_REG);

	}



	return insn->n;
@@ -118,8 +106,8 @@ static int addi_watchdog_insn_write(struct comedi_device *dev, 


void addi_watchdog_reset(unsigned long iobase)

{

	outl(0x0, iobase + ADDI_WDOG_CTRL_REG);

	outl(0x0, iobase + ADDI_WDOG_RELOAD_REG);

	outl(0x0, iobase + ADDI_TCW_CTRL_REG);

	outl(0x0, iobase + ADDI_TCW_RELOAD_REG);

}

EXPORT_SYMBOL_GPL(addi_watchdog_reset);