evie/android_kernel_oneplus_msm8998
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

staging: comedi: pcl711: fix software trigger for board->is_8112

Browse source 
The acl-8112 boards also need to write a value to the software
trigger register in order to start an A/D conversion. Remove the
if (!board->is_8112) test so that the write is always done.

Also, the analog input mode does not need to be set each time for
multiple samples. Move the pcl711_ai_set_mode() out of the for loop.

Signed-off-by: H Hartley Sweeten <hsweeten@visionengravers.com>
Reviewed-by: Ian Abbott <abbotti@mev.co.uk>
Signed-off-by: Greg Kroah-Hartman <gregkh@linuxfoundation.org>
This commit is contained in:
H Hartley Sweeten 2013-09-20 16:41:39 -07:00 • committed by Greg Kroah-Hartman
parent 075eaef87e
commit 1c4babb246
1 changed files with 5 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
drivers/staging/comedi/drivers/pcl711.c
View file

@ -91,7 +91,8 @@ supported.
#define PCL711_MODE_PACER (4 << 0)
#define PCL711_MODE_PACER_IRQ (6 << 0)
#define PCL711_MODE_IRQ(x) (((x) & 0x7) << 4)
#define PCL711_SOFTTRIG 0x0c
#define PCL711_SOFTTRIG_REG 0x0c
#define PCL711_SOFTTRIG (0 << 0) /* any value will work */
#define PCL711_DO_LO 0x0d
#define PCL711_DO_HI 0x0e
@ -280,17 +281,15 @@ static int pcl711_ai_wait_for_eoc(struct comedi_device *dev,
static int pcl711_ai_insn(struct comedi_device *dev, struct comedi_subdevice *s,
struct comedi_insn *insn, unsigned int *data)
{
const struct pcl711_board *board = comedi_board(dev);
int ret;
int n;
pcl711_set_changain(dev, insn->chanspec);
for (n = 0; n < insn->n; n++) {
pcl711_ai_set_mode(dev, PCL711_MODE_SOFTTRIG);
if (!board->is_8112)
outb(0, dev->iobase + PCL711_SOFTTRIG);
for (n = 0; n < insn->n; n++) {
outb(PCL711_SOFTTRIG, dev->iobase + PCL711_SOFTTRIG_REG);
ret = pcl711_ai_wait_for_eoc(dev, 100);
if (ret)