Skip to content

Commit

Permalink
---
Browse files Browse the repository at this point in the history
yaml
---
r: 175159
b: refs/heads/master
c: 16fbf4c
h: refs/heads/master
i:
  175157: 7acf01b
  175155: e1b26bd
  175151: 565e427
v: v3
  • Loading branch information
Vijay Kumar B authored and Greg Kroah-Hartman committed Dec 11, 2009
1 parent 67337d5 commit 7b0e324
Show file tree
Hide file tree
Showing 2 changed files with 11 additions and 4 deletions.
2 changes: 1 addition & 1 deletion [refs]
Original file line number Diff line number Diff line change
@@ -1,2 +1,2 @@
---
refs/heads/master: e1bc58459aa23ec4e8f1e1aa2cacae215d04a949
refs/heads/master: 16fbf4cba0880c31445d6414abbd7a1c51466b1f
13 changes: 10 additions & 3 deletions trunk/drivers/staging/poch/poch.c
Original file line number Diff line number Diff line change
Expand Up @@ -245,6 +245,11 @@ struct poch_dev {
struct device *dev;
};

static int synth_rx;
module_param(synth_rx, bool, 0600);
MODULE_PARM_DESC(synth_rx,
"Synthesize received values using a counter. Default: No");

static dev_t poch_first_dev;
static struct class *poch_cls;
static DEFINE_IDR(poch_ids);
Expand Down Expand Up @@ -827,9 +832,11 @@ static int poch_open(struct inode *inode, struct file *filp)
fpga + FPGA_TX_CTL_REG);
} else {
/* Flush RX FIFO and output data to cardbus. */
iowrite32(FPGA_RX_CTL_CONT_CAP
| FPGA_RX_CTL_FIFO_FLUSH,
fpga + FPGA_RX_CTL_REG);
u32 ctl_val = FPGA_RX_CTL_CONT_CAP | FPGA_RX_CTL_FIFO_FLUSH;
if (synth_rx)
ctl_val |= FPGA_RX_CTL_SYNTH_DATA;

iowrite32(ctl_val, fpga + FPGA_RX_CTL_REG);
}

atomic_inc(&channel->inited);
Expand Down

0 comments on commit 7b0e324

Please sign in to comment.