summaryrefslogtreecommitdiffstats
path: root/drivers/media/dvb/mantis
diff options
context:
space:
mode:
authorManu Abraham2009-12-04 09:25:18 +0100
committerMauro Carvalho Chehab2010-01-17 14:55:38 +0100
commitadcc9dd57e814d5ac3928f92f431fbe4808e936f (patch)
treee3dbcd945a2cdcb5d4471f773dd9bd66f1efaaa8 /drivers/media/dvb/mantis
parentV4L/DVB (13767): [Mantis/VP-1041] Bug: Add in missing Master clock settings (diff)
downloadkernel-qcow2-linux-adcc9dd57e814d5ac3928f92f431fbe4808e936f.tar.gz
kernel-qcow2-linux-adcc9dd57e814d5ac3928f92f431fbe4808e936f.tar.xz
kernel-qcow2-linux-adcc9dd57e814d5ac3928f92f431fbe4808e936f.zip
V4L/DVB (13768): [Mantis] Enable WRACK
Signed-off-by: Manu Abraham <manu@linuxtv.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/dvb/mantis')
-rw-r--r--drivers/media/dvb/mantis/mantis_evm.c10
-rw-r--r--drivers/media/dvb/mantis/mantis_hif.c1
2 files changed, 10 insertions, 1 deletions
diff --git a/drivers/media/dvb/mantis/mantis_evm.c b/drivers/media/dvb/mantis/mantis_evm.c
index 214ae5ee31ec..000cf396a2c7 100644
--- a/drivers/media/dvb/mantis/mantis_evm.c
+++ b/drivers/media/dvb/mantis/mantis_evm.c
@@ -27,11 +27,19 @@ static void mantis_hifevm_work(struct work_struct *work)
struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work);
struct mantis_pci *mantis = ca->ca_priv;
- u32 gpif_stat, gpif_mask;
+ u32 gpif_stat, gpif_mask, rst_mask, rst_stat;
+
+ rst_mask = MANTIS_GPIF_WRACK |
+ MANTIS_GPIF_OTHERR |
+ MANTIS_SBUF_WSTO |
+ MANTIS_GPIF_EXTIRQ;
gpif_stat = mmread(MANTIS_GPIF_STATUS);
gpif_mask = mmread(MANTIS_GPIF_IRQCFG);
+ rst_stat = gpif_stat & rst_mask;
+ mmwrite(rst_stat, MANTIS_GPIF_STATUS);
+
if (gpif_stat & MANTIS_GPIF_DETSTAT) {
if (gpif_stat & MANTIS_CARD_PLUGIN) {
dprintk(verbose, MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): CAM Plugin", mantis->num);
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index c2cecc3d7b19..2f1a6cb943db 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -188,6 +188,7 @@ int mantis_hif_init(struct mantis_ca *ca)
irqcfg = mmread(MANTIS_GPIF_IRQCFG);
irqcfg |= MANTIS_MASK_BRRDY;
+ irqcfg |= MANTIS_MASK_WRACK;
mmwrite(irqcfg, MANTIS_GPIF_IRQCFG);
return 0;