1 files changed, 30 insertions, 15 deletions

diff --git a/drivers/media/dvb/bt8xx/dvb-bt8xx.c b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
index ea27b15007e9..baa8227ef87c 100644
--- a/drivers/media/dvb/bt8xx/dvb-bt8xx.c
+++ b/drivers/media/dvb/bt8xx/dvb-bt8xx.c
@@ -76,13 +76,13 @@ static int dvb_bt8xx_start_feed(struct dvb_demux_feed *dvbdmxfeed)
         if (!dvbdmx->dmx.frontend)
                 return -EINVAL;
 
-        down(&card->lock);
+        mutex_lock(&card->lock);
         card->nfeeds++;
         rc = card->nfeeds;
         if (card->nfeeds == 1)
                 bt878_start(card->bt, card->gpio_mode,
                             card->op_sync_orin, card->irq_err_ignore);
-        up(&card->lock);
+        mutex_unlock(&card->lock);
         return rc;
 }
 
@@ -96,11 +96,11 @@ static int dvb_bt8xx_stop_feed(struct dvb_demux_feed *dvbdmxfeed)
         if (!dvbdmx->dmx.frontend)
                 return -EINVAL;
 
-        down(&card->lock);
+        mutex_lock(&card->lock);
         card->nfeeds--;
         if (card->nfeeds == 0)
                 bt878_stop(card->bt);
-        up(&card->lock);
+        mutex_unlock(&card->lock);
 
         return 0;
 }
@@ -239,6 +239,20 @@ static int cx24108_pll_set(struct dvb_frontend* fe, struct dvb_frontend_paramete
 
 static int pinnsat_pll_init(struct dvb_frontend* fe)
 {
+        struct dvb_bt8xx_card *card = fe->dvb->priv;
+
+        bttv_gpio_enable(card->bttv_nr, 1, 1);  /* output */
+        bttv_write_gpio(card->bttv_nr, 1, 1);   /* relay on */
+
+        return 0;
+}
+
+static int pinnsat_pll_sleep(struct dvb_frontend* fe)
+{
+        struct dvb_bt8xx_card *card = fe->dvb->priv;
+
+        bttv_write_gpio(card->bttv_nr, 1, 0);   /* relay off */
+
         return 0;
 }
 
@@ -246,6 +260,7 @@ static struct cx24110_config pctvsat_config = {
         .demod_address = 0x55,
         .pll_init = pinnsat_pll_init,
         .pll_set = cx24108_pll_set,
+        .pll_sleep = pinnsat_pll_sleep,
 };
 
 static int microtune_mt7202dtf_pll_set(struct dvb_frontend* fe, struct dvb_frontend_parameters* params)
@@ -788,7 +803,7 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
         if (!(card = kzalloc(sizeof(struct dvb_bt8xx_card), GFP_KERNEL)))
                 return -ENOMEM;
 
-        init_MUTEX(&card->lock);
+        mutex_init(&card->lock);
         card->bttv_nr = sub->core->nr;
         strncpy(card->card_name, sub->core->name, sizeof(sub->core->name));
         card->i2c_adapter = &sub->core->i2c_adap;
@@ -798,14 +813,14 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
                 card->gpio_mode = 0x0400c060;
                 /* should be: BT878_A_GAIN=0,BT878_A_PWRDN,BT878_DA_DPM,BT878_DA_SBR,
                               BT878_DA_IOM=1,BT878_DA_APP to enable serial highspeed mode. */
-                card->op_sync_orin = 0;
-                card->irq_err_ignore = 0;
+                card->op_sync_orin = BT878_RISC_SYNC_MASK;
+                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
                 break;
 
         case BTTV_BOARD_DVICO_DVBT_LITE:
                 card->gpio_mode = 0x0400C060;
-                card->op_sync_orin = 0;
-                card->irq_err_ignore = 0;
+                card->op_sync_orin = BT878_RISC_SYNC_MASK;
+                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
                 /* 26, 15, 14, 6, 5
                  * A_PWRDN  DA_DPM DA_SBR DA_IOM_DA
                  * DA_APP(parallel) */
@@ -820,15 +835,15 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
         case BTTV_BOARD_NEBULA_DIGITV:
         case BTTV_BOARD_AVDVBT_761:
                 card->gpio_mode = (1 << 26) | (1 << 14) | (1 << 5);
-                card->op_sync_orin = 0;
-                card->irq_err_ignore = 0;
+                card->op_sync_orin = BT878_RISC_SYNC_MASK;
+                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
                 /* A_PWRDN DA_SBR DA_APP (high speed serial) */
                 break;
 
         case BTTV_BOARD_AVDVBT_771: //case 0x07711461:
                 card->gpio_mode = 0x0400402B;
                 card->op_sync_orin = BT878_RISC_SYNC_MASK;
-                card->irq_err_ignore = 0;
+                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
                 /* A_PWRDN DA_SBR  DA_APP[0] PKTP=10 RISC_ENABLE FIFO_ENABLE*/
                 break;
 
@@ -852,8 +867,8 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
 
         case BTTV_BOARD_PC_HDTV:
                 card->gpio_mode = 0x0100EC7B;
-                card->op_sync_orin = 0;
-                card->irq_err_ignore = 0;
+                card->op_sync_orin = BT878_RISC_SYNC_MASK;
+                card->irq_err_ignore = BT878_AFBUS | BT878_AFDSR;
                 break;
 
         default:
@@ -881,7 +896,7 @@ static int dvb_bt8xx_probe(struct bttv_sub_device *sub)
                 return -EFAULT;
         }
 
-        init_MUTEX(&card->bt->gpio_lock);
+        mutex_init(&card->bt->gpio_lock);
         card->bt->bttv_nr = sub->core->nr;
 
         if ( (ret = dvb_bt8xx_load_card(card, sub->core->type)) ) {