V4L/DVB (13751): [Mantis] GPIO_CONTROL: Do not toggle GPIO CW's on HIF operations

Signed-off-by: Manu Abraham <manu@linuxtv.org>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

2 files changed, 7 insertions, 4 deletions

diff --git a/drivers/media/dvb/mantis/mantis_common.h b/drivers/media/dvb/mantis/mantis_common.h
index 75f07736e001..49f2f118b498 100644
--- a/drivers/media/dvb/mantis/mantis_common.h
+++ b/drivers/media/dvb/mantis/mantis_common.h
@@ -142,6 +142,8 @@ struct mantis_pci {
         struct mantis_ca        *mantis_ca;
 };
 
+#define MANTIS_HIF_STATUS       (mantis->gpio_status << 12)
+
 extern unsigned int verbose;
 extern unsigned int devs;
 extern unsigned int i2c;
diff --git a/drivers/media/dvb/mantis/mantis_hif.c b/drivers/media/dvb/mantis/mantis_hif.c
index d18fe4152449..96611b67cb4b 100644
--- a/drivers/media/dvb/mantis/mantis_hif.c
+++ b/drivers/media/dvb/mantis/mantis_hif.c
@@ -56,6 +56,7 @@ static int mantis_hif_sbuf_opdone_wait(struct mantis_ca *ca)
         return rc;
 }
 
+
 int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
 {
         struct mantis_pci *mantis = ca->ca_priv;
@@ -67,7 +68,7 @@ int mantis_hif_read_mem(struct mantis_ca *ca, u32 addr)
         hif_addr &= ~MANTIS_GPIF_PCMCIAIOM;
         hif_addr |=  addr;
 
-        mmwrite(hif_addr, MANTIS_GPIF_BRADDR);
+        mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_BRADDR);
         mmwrite(count, MANTIS_GPIF_BRBYTES);
 
         udelay(20);
@@ -100,7 +101,7 @@ int mantis_hif_write_mem(struct mantis_ca *ca, u32 addr, u8 data)
 
         mmwrite(slot->slave_cfg, MANTIS_GPIF_CFGSLA); /* Slot0 alone for now */
 
-        mmwrite(hif_addr, MANTIS_GPIF_ADDR);
+        mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
         mmwrite(data, MANTIS_GPIF_DOUT);
         ca->hif_job_queue = MANTIS_HIF_MEMWR;
 
@@ -124,7 +125,7 @@ int mantis_hif_read_iom(struct mantis_ca *ca, u32 addr)
         hif_addr |=  MANTIS_GPIF_PCMCIAIOM;
         hif_addr |=  addr;
 
-        mmwrite(hif_addr, MANTIS_GPIF_ADDR);
+        mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
         ca->hif_job_queue = MANTIS_HIF_IOMRD;
 
         if (mantis_hif_sbuf_opdone_wait(ca) != 0) {
@@ -152,7 +153,7 @@ int mantis_hif_write_iom(struct mantis_ca *ca, u32 addr, u8 data)
         hif_addr |=  MANTIS_GPIF_PCMCIAIOM;
         hif_addr |=  addr;
 
-        mmwrite(hif_addr, MANTIS_GPIF_ADDR);
+        mmwrite(hif_addr | MANTIS_HIF_STATUS, MANTIS_GPIF_ADDR);
         mmwrite(data, MANTIS_GPIF_DOUT);
 
         ca->hif_job_queue = MANTIS_HIF_IOMWR;