aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/cx23885
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2011-01-25 17:07:00 -0300
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-03-21 20:32:18 -0300
commit702dd7903bda0b83f6f6cb66fdadc4e5bbb60646 (patch)
tree29afbbd7336599e4166c8f59753a1542352620a3 /drivers/media/video/cx23885
parent10d0dcd73c619d86b8ba1c9cd753ce749f578bf4 (diff)
downloadkernel_samsung_smdk4412-702dd7903bda0b83f6f6cb66fdadc4e5bbb60646.tar.gz
kernel_samsung_smdk4412-702dd7903bda0b83f6f6cb66fdadc4e5bbb60646.tar.bz2
kernel_samsung_smdk4412-702dd7903bda0b83f6f6cb66fdadc4e5bbb60646.zip
[media] cx23885: disable MSI for NetUP cards, otherwise CI is not working
Signed-off-by: Igor M. Liplianin <liplianin@netup.ru> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/cx23885')
-rw-r--r--drivers/media/video/cx23885/cx23885-core.c4
-rw-r--r--drivers/media/video/cx23885/cx23885-reg.h1
2 files changed, 5 insertions, 0 deletions
diff --git a/drivers/media/video/cx23885/cx23885-core.c b/drivers/media/video/cx23885/cx23885-core.c
index d778b1ae921..9933810b4e3 100644
--- a/drivers/media/video/cx23885/cx23885-core.c
+++ b/drivers/media/video/cx23885/cx23885-core.c
@@ -1041,6 +1041,10 @@ static int cx23885_dev_setup(struct cx23885_dev *dev)
cx23885_dev_checkrevision(dev);
+ /* disable MSI for NetUP cards, otherwise CI is not working */
+ if (cx23885_boards[dev->board].ci_type > 0)
+ cx_clear(RDR_RDRCTL1, 1 << 8);
+
return 0;
}
diff --git a/drivers/media/video/cx23885/cx23885-reg.h b/drivers/media/video/cx23885/cx23885-reg.h
index a28772db11f..c87ac682ebb 100644
--- a/drivers/media/video/cx23885/cx23885-reg.h
+++ b/drivers/media/video/cx23885/cx23885-reg.h
@@ -292,6 +292,7 @@ Channel manager Data Structure entry = 20 DWORD
#define RDR_CFG0 0x00050000
#define RDR_CFG1 0x00050004
#define RDR_CFG2 0x00050008
+#define RDR_RDRCTL1 0x0005030c
#define RDR_TLCTL0 0x00050318
/* APB DMAC Current Buffer Pointer */