aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media
diff options
context:
space:
mode:
authorManu Abraham <abraham.manu@gmail.com>2009-12-04 03:25:18 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2010-01-17 08:55:38 -0500
commitadcc9dd57e814d5ac3928f92f431fbe4808e936f (patch)
treee3dbcd945a2cdcb5d4471f773dd9bd66f1efaaa8 /drivers/media
parent18b6de42d77e7762be929a4a858c359de352e1e2 (diff)
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')
-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)
27 struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work); 27 struct mantis_ca *ca = container_of(work, struct mantis_ca, hif_evm_work);
28 struct mantis_pci *mantis = ca->ca_priv; 28 struct mantis_pci *mantis = ca->ca_priv;
29 29
30 u32 gpif_stat, gpif_mask; 30 u32 gpif_stat, gpif_mask, rst_mask, rst_stat;
31
32 rst_mask = MANTIS_GPIF_WRACK |
33 MANTIS_GPIF_OTHERR |
34 MANTIS_SBUF_WSTO |
35 MANTIS_GPIF_EXTIRQ;
31 36
32 gpif_stat = mmread(MANTIS_GPIF_STATUS); 37 gpif_stat = mmread(MANTIS_GPIF_STATUS);
33 gpif_mask = mmread(MANTIS_GPIF_IRQCFG); 38 gpif_mask = mmread(MANTIS_GPIF_IRQCFG);
34 39
40 rst_stat = gpif_stat & rst_mask;
41 mmwrite(rst_stat, MANTIS_GPIF_STATUS);
42
35 if (gpif_stat & MANTIS_GPIF_DETSTAT) { 43 if (gpif_stat & MANTIS_GPIF_DETSTAT) {
36 if (gpif_stat & MANTIS_CARD_PLUGIN) { 44 if (gpif_stat & MANTIS_CARD_PLUGIN) {
37 dprintk(verbose, MANTIS_DEBUG, 1, "Event Mgr: Adapter(%d) Slot(0): CAM Plugin", mantis->num); 45 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)
188 188
189 irqcfg = mmread(MANTIS_GPIF_IRQCFG); 189 irqcfg = mmread(MANTIS_GPIF_IRQCFG);
190 irqcfg |= MANTIS_MASK_BRRDY; 190 irqcfg |= MANTIS_MASK_BRRDY;
191 irqcfg |= MANTIS_MASK_WRACK;
191 mmwrite(irqcfg, MANTIS_GPIF_IRQCFG); 192 mmwrite(irqcfg, MANTIS_GPIF_IRQCFG);
192 193
193 return 0; 194 return 0;