[media] saa7134: Fix analog mode for Kworld SBTVD

[pandora-kernel.git] / drivers / media / video / saa7134 / saa7134-cards.c

diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index 1d4d0a4..b242600 100644 (file)
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -5176,6 +5176,49 @@ struct saa7134_board saa7134_boards[] = {
                        .amux = 2,
                },
        },
+       [SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG] = {
+               .name           = "Kworld PCI SBTVD/ISDB-T Full-Seg Hybrid",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_PHILIPS_TDA8290,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_type     = UNSET,
+               .radio_addr     = ADDR_UNSET,
+               .gpiomask       = 0x8e054000,
+               .mpeg           = SAA7134_MPEG_DVB,
+               .ts_type        = SAA7134_MPEG_TS_PARALLEL,
+               .inputs = { {
+                       .name   = name_tv,
+                       .vmux   = 1,
+                       .amux   = TV,
+                       .tv     = 1,
+                       .gpio   = 0x4000,
+#if 0  /* FIXME */
+               }, {
+                       .name   = name_comp1,
+                       .vmux   = 3,
+                       .amux   = LINE1,
+                       .gpio   = 0x200,
+               }, {
+                       .name   = name_svideo,
+                       .vmux   = 8,
+                       .amux   = LINE1,
+                       .gpio   = 0x200,
+#endif
+               } },
+#if 0
+               .radio = {
+                       .name   = name_radio,
+                       .vmux   = 1,
+                       .amux   = LINE1,
+                       .gpio   = 0x100,
+               },
+#endif
+               .mute = {
+                       .name = name_mute,
+                       .vmux = 0,
+                       .amux = TV,
+               },
+       },
        [SAA7134_BOARD_AVERMEDIA_GO_007_FM_PLUS] = {
                .name           = "Avermedia AVerTV GO 007 FM Plus",
                .audio_clock    = 0x00187de7,
@@ -5486,6 +5529,37 @@ struct saa7134_board saa7134_boards[] = {
                        .amux   = LINE2,
                } },
        },
+       [SAA7134_BOARD_VIDEOMATE_M1F] = {
+               /* Pavel Osnova <pvosnova@gmail.com> */
+               .name           = "Compro VideoMate Vista M1F",
+               .audio_clock    = 0x00187de7,
+               .tuner_type     = TUNER_LG_PAL_NEW_TAPC,
+               .radio_type     = TUNER_TEA5767,
+               .tuner_addr     = ADDR_UNSET,
+               .radio_addr     = 0x60,
+               .inputs         = { {
+                       .name = name_tv,
+                       .vmux = 1,
+                       .amux = TV,
+                       .tv   = 1,
+               }, {
+                       .name = name_comp1,
+                       .vmux = 3,
+                       .amux = LINE2,
+               }, {
+                       .name = name_svideo,
+                       .vmux = 8,
+                       .amux = LINE2,
+               } },
+               .radio = {
+                       .name = name_radio,
+                       .amux = LINE1,
+               },
+               .mute = {
+                       .name = name_mute,
+                       .amux = TV,
+               },
+       },
 
 };
 
@@ -6612,6 +6686,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subvendor    = 0x17de,
                .subdevice    = 0x7128,
                .driver_data  = SAA7134_BOARD_KWORLD_PLUS_TV_ANALOG,
+       }, {
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+               .subvendor    = 0x17de,
+               .subdevice    = 0xb136,
+               .driver_data  = SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG,
        }, {
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
@@ -6672,6 +6752,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subvendor    = 0x5ace, /* Beholder Intl. Ltd. */
                .subdevice    = 0x7090,
                .driver_data  = SAA7134_BOARD_BEHOLD_A7,
+       }, {
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7135,
+               .subvendor    = 0x185b,
+               .subdevice    = 0xc900,
+               .driver_data  = SAA7134_BOARD_VIDEOMATE_M1F,
        }, {
                /* --- boards without eeprom + subsystem ID --- */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -6831,6 +6917,23 @@ static inline int saa7134_tda18271_hvr11x0_toggle_agc(struct saa7134_dev *dev,
        return 0;
 }
 
+static inline int saa7134_kworld_sbtvd_toggle_agc(struct saa7134_dev *dev,
+                                                 enum tda18271_mode mode)
+{
+       /* toggle AGC switch through GPIO 27 */
+       switch (mode) {
+       case TDA18271_ANALOG:
+               saa7134_set_gpio(dev, 27, 0);
+               break;
+       case TDA18271_DIGITAL:
+               saa7134_set_gpio(dev, 27, 1);
+               break;
+       default:
+               return -EINVAL;
+       }
+       return 0;
+}
+
 static int saa7134_tda8290_18271_callback(struct saa7134_dev *dev,
                                          int command, int arg)
 {
@@ -6843,6 +6946,9 @@ static int saa7134_tda8290_18271_callback(struct saa7134_dev *dev,
                case SAA7134_BOARD_HAUPPAUGE_HVR1120:
                        ret = saa7134_tda18271_hvr11x0_toggle_agc(dev, arg);
                        break;
+               case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
+                       ret = saa7134_kworld_sbtvd_toggle_agc(dev, arg);
+                       break;
                default:
                        break;
                }
@@ -6863,6 +6969,7 @@ static int saa7134_tda8290_callback(struct saa7134_dev *dev,
        case SAA7134_BOARD_HAUPPAUGE_HVR1150:
        case SAA7134_BOARD_HAUPPAUGE_HVR1120:
        case SAA7134_BOARD_AVERMEDIA_M733A:
+       case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
                /* tda8290 + tda18271 */
                ret = saa7134_tda8290_18271_callback(dev, command, arg);
                break;
@@ -6967,6 +7074,7 @@ int saa7134_board_init1(struct saa7134_dev *dev)
        case SAA7134_BOARD_VIDEOMATE_TV_PVR:
        case SAA7134_BOARD_VIDEOMATE_GOLD_PLUS:
        case SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUSII:
+       case SAA7134_BOARD_VIDEOMATE_M1F:
        case SAA7134_BOARD_VIDEOMATE_DVBT_300:
        case SAA7134_BOARD_VIDEOMATE_DVBT_200:
        case SAA7134_BOARD_VIDEOMATE_DVBT_200A:
@@ -7541,6 +7649,12 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                                       dev->name);
                break;
        }
+       case SAA7134_BOARD_KWORLD_PCI_SBTVD_FULLSEG:
+               saa_writel(SAA7134_GPIO_GPMODE0 >> 2, 0x4000);
+               saa_writel(SAA7134_GPIO_GPSTATUS0 >> 2, 0x4000);
+
+               saa7134_set_gpio(dev, 27, 0);
+               break;
        } /* switch() */
 
        /* initialize tuner */