[PATCH] v4l: 691: set if of tda8275 according to tv norm

[mirror_ubuntu-artful-kernel.git] / drivers / media / video / bttv-cards.c

diff --git a/drivers/media/video/bttv-cards.c b/drivers/media/video/bttv-cards.c
index 0881a17d5226416723edfb1e2bc64a66a2d388a1..c6010692746db9aae5ff05cdc539bb7ae9dffccd 100644 (file)
--- a/drivers/media/video/bttv-cards.c
+++ b/drivers/media/video/bttv-cards.c
@@ -1063,7 +1063,7 @@ struct tvcard bttv_tvcards[] = {
 },{
 
 /* ---- card 0x34 ---------------------------------- */
-       /* David Härdeman <david@2gen.com> */
+       /* David Härdeman <david@2gen.com> */
        .name           = "Pinnacle PCTV Studio Pro",
        .video_inputs   = 4,
        .audio_inputs   = 1,
@@ -1731,10 +1731,7 @@ struct tvcard bttv_tvcards[] = {
        .no_msp34xx     = 1,
        .no_tda9875     = 1,
        .no_tda7432     = 1,
-       .gpiomask       = 0x01,
-       .audiomux       = { 0, 0, 0, 0, 1 },
        .muxsel         = { 3, 0, 1, 2},
-       .needs_tvaudio  = 0,
        .pll            = PLL_28,
        .no_gpioirq     = 1,
        .has_dvb        = 1,
@@ -2402,6 +2399,7 @@ struct tvcard bttv_tvcards[] = {
        .no_msp34xx     = 1,
        .no_tda9875     = 1,
        .no_tda7432     = 1,
+       .has_dvb        = 1,
 },{
        /* ---- card 0x88---------------------------------- */
        /* Mauro Carvalho Chehab <mchehab@brturbo.com.br> */
@@ -2418,6 +2416,35 @@ struct tvcard bttv_tvcards[] = {
        .tuner_type     = TUNER_YMEC_TVF66T5_B_DFF,
        .tuner_addr     = 0xc1 >>1,
        .has_radio      = 1,
+},{
+       /* ---- card 0x89 ---------------------------------- */
+       .name           = "Conceptronic CTVFMi v2",
+       .video_inputs   = 3,
+       .audio_inputs   = 1,
+       .tuner          = 0,
+       .svhs           = 2,
+       .gpiomask       = 0x001c0007,
+       .muxsel         = { 2, 3, 1, 1 },
+       .audiomux       = { 0, 1, 2, 2, 3 },
+       .needs_tvaudio  = 0,
+       .pll            = PLL_28,
+       .tuner_type     = TUNER_PHILIPS_FM1216ME_MK3,
+       .tuner_addr     = ADDR_UNSET,
+       .has_remote     = 1,
+},{
+         .name           = "Prolink Pixelview PV-BT878P+ (Rev.2E)",
+         .video_inputs   = 5,
+         .audio_inputs   = 1,
+         .tuner          = 0,
+         .svhs           = 3,
+         .gpiomask       = 0x01fe00,
+         .muxsel         = { 2,3,1,1,-1 },
+         .digital_mode   = DIGITAL_MODE_CAMERA,
+         .audiomux       = { 0x00400, 0x10400, 0x04400, 0x80000, 0x12400, 0x46000  },
+         .no_msp34xx     = 1,
+         .pll            = PLL_28,
+         .tuner_type     = TUNER_LG_PAL_FM,
+         .has_remote     = 1,
 }};
 
 static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
@@ -2793,11 +2820,12 @@ void __devinit bttv_init_card1(struct bttv *btv)
                break;
        case BTTV_TWINHAN_DST:
        case BTTV_AVDVBT_771:
+       case BTTV_PINNACLESAT:
                btv->use_i2c_hw = 1;
                break;
-        case BTTV_ADLINK_RTV24:
-                init_RTV24( btv );
-                break;
+       case BTTV_ADLINK_RTV24:
+               init_RTV24( btv );
+               break;
 
        }
        if (!bttv_tvcards[btv->c.type].has_dvb)
@@ -2982,8 +3010,8 @@ void __devinit bttv_init_card2(struct bttv *btv)
                btv->has_radio=1;
        if (bttv_tvcards[btv->c.type].has_remote)
                btv->has_remote=1;
-       if (bttv_tvcards[btv->c.type].no_gpioirq)
-               btv->gpioirq=0;
+       if (!bttv_tvcards[btv->c.type].no_gpioirq)
+               btv->gpioirq=1;
        if (bttv_tvcards[btv->c.type].audio_hook)
                btv->audio_hook=bttv_tvcards[btv->c.type].audio_hook;
 
@@ -3342,7 +3370,7 @@ void bttv_tda9880_setnorm(struct bttv *btv, int norm)
 
 /*
  * reset/enable the MSP on some Hauppauge cards
- * Thanks to Kyösti Mälkki (kmalkki@cc.hut.fi)!
+ * Thanks to Kyösti Mälkki (kmalkki@cc.hut.fi)!
  *
  * Hauppauge:  pin  5
  * Voodoo:     pin 20