]> err.no Git - linux-2.6/commitdiff
[PATCH] V4L: 908: added dvb-t support for asus p7134 dual
authorHartmut Hackmann <hartmut.hackmann@t.online.de>
Wed, 9 Nov 2005 05:38:44 +0000 (21:38 -0800)
committerLinus Torvalds <torvalds@g5.osdl.org>
Wed, 9 Nov 2005 15:56:30 +0000 (07:56 -0800)
- Added dvb-t support for Asus P7134 Dual
- added pci id for ADS Tech Instant TV cardbus variant

Signed-off-by: Hartmut Hackmann <hartmut.hackmann@t.online.de>
Signed-off-by: Mauro Carvalho Chehab <mchehab@brturbo.com.br>
Signed-off-by: Andrew Morton <akpm@osdl.org>
Signed-off-by: Linus Torvalds <torvalds@osdl.org>
drivers/media/video/saa7134/saa7134-cards.c
drivers/media/video/saa7134/saa7134-dvb.c

index e3fe15a14aee0f5fdd8f89c9b90c09ccdad42c34..ac361858901a9e86b90cd2d4d1ce8be73287a72e 100644 (file)
@@ -2431,6 +2431,7 @@ struct saa7134_board saa7134_boards[] = {
                .tuner_addr     = ADDR_UNSET,
                .radio_addr     = ADDR_UNSET,
                .gpiomask       = 1 << 21,
+               .mpeg           = SAA7134_MPEG_DVB,
                .inputs         = {{
                        .name = name_tv,
                        .vmux = 1,
@@ -2864,13 +2865,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
                .subvendor    = 0x1421,
                .subdevice    = 0x0350,         /* PCI version */
                .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
-
        },{
                .vendor       = PCI_VENDOR_ID_PHILIPS,
                .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
                .subvendor    = 0x1421,
                .subdevice    = 0x0370,         /* cardbus version */
                .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
+       },{
+               .vendor       = PCI_VENDOR_ID_PHILIPS,
+               .device       = PCI_DEVICE_ID_PHILIPS_SAA7133,
+               .subvendor    = 0x1421,
+               .subdevice    = 0x1370,        /* cardbus version */
+               .driver_data  = SAA7134_BOARD_ADS_INSTANT_TV,
 
        },{     /* Typhoon DVB-T Duo Digital/Analog Cardbus */
                .vendor       = PCI_VENDOR_ID_PHILIPS,
@@ -3222,6 +3228,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
                }
                break;
        case SAA7134_BOARD_PHILIPS_TIGER:
+       case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
                /* this is a hybrid board, initialize to analog mode */
                {
                u8 data[] = { 0x3c, 0x33, 0x68};
index c0337cf919560f7abd54865baf18860e5160dca3..8545d30d9f709c6f3d517cf2b48d3647ddfa7697 100644 (file)
@@ -880,6 +880,10 @@ static int dvb_init(struct saa7134_dev *dev)
                dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
                                                    &dev->i2c_adap);
                break;
+       case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
+               dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
+                                                   &dev->i2c_adap);
+               break;
 #endif
 #ifdef HAVE_NXT200X
        case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: