summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAbylay Ospan <aospan@netup.ru>2011-01-02 09:10:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-22 04:54:07 -0300
commitd164460f897e2ae8c48ca28c763bb1233d180e7e (patch)
treed3fdc11348fbff63a27ff2721a67d6915a3f0063
parent1039752353f1308bcd594a79196f60a22d45975d (diff)
[media] cx23885: Altera FPGA CI interface reworked
It decreases I2C traffic. Signed-off-by: Abylay Ospan <aospan@netup.ru> Signed-off-by: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c18
1 files changed, 9 insertions, 9 deletions
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index cf36b9b4794e..c0e665506750 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -620,29 +620,29 @@ int netup_altera_fpga_rw(void *device, int flag, int data, int read)
{
struct cx23885_dev *dev = (struct cx23885_dev *)device;
unsigned long timeout = jiffies + msecs_to_jiffies(1);
- int mem = 0;
+ uint32_t mem = 0;
- cx_set(MC417_RWD, ALT_RD | ALT_WR | ALT_CS);
+ mem = cx_read(MC417_RWD);
if (read)
cx_set(MC417_OEN, ALT_DATA);
else {
cx_clear(MC417_OEN, ALT_DATA);/* D0-D7 out */
- mem = cx_read(MC417_RWD);
mem &= ~ALT_DATA;
mem |= (data & ALT_DATA);
- cx_write(MC417_RWD, mem);
}
if (flag)
- cx_set(MC417_RWD, ALT_AD_RG);/* ADDR */
+ mem |= ALT_AD_RG;
else
- cx_clear(MC417_RWD, ALT_AD_RG);/* VAL */
+ mem &= ~ALT_AD_RG;
- cx_clear(MC417_RWD, ALT_CS);/* ~CS */
+ mem &= ~ALT_CS;
if (read)
- cx_clear(MC417_RWD, ALT_RD);
+ mem = (mem & ~ALT_RD) | ALT_WR;
else
- cx_clear(MC417_RWD, ALT_WR);
+ mem = (mem & ~ALT_WR) | ALT_RD;
+
+ cx_write(MC417_RWD, mem); /* start RW cycle */
for (;;) {
mem = cx_read(MC417_RWD);