aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorHartmut Hackmann <hartmut.hackmann@t.online.de>2005-11-09 00:38:44 -0500
committerLinus Torvalds <torvalds@g5.osdl.org>2005-11-09 10:56:30 -0500
commitd4b0aba47d48a339572744cb23ba925f04e3cda9 (patch)
treece20014297024a139752b83c906759b79e2b93a8
parenteac94356c8f9f7d3854ed0290a406b13bfe8df4c (diff)
[PATCH] V4L: 908: added dvb-t support for asus p7134 dual
- 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>
-rw-r--r--drivers/media/video/saa7134/saa7134-cards.c9
-rw-r--r--drivers/media/video/saa7134/saa7134-dvb.c4
2 files changed, 12 insertions, 1 deletions
diff --git a/drivers/media/video/saa7134/saa7134-cards.c b/drivers/media/video/saa7134/saa7134-cards.c
index e3fe15a14aee..ac361858901a 100644
--- a/drivers/media/video/saa7134/saa7134-cards.c
+++ b/drivers/media/video/saa7134/saa7134-cards.c
@@ -2431,6 +2431,7 @@ struct saa7134_board saa7134_boards[] = {
2431 .tuner_addr = ADDR_UNSET, 2431 .tuner_addr = ADDR_UNSET,
2432 .radio_addr = ADDR_UNSET, 2432 .radio_addr = ADDR_UNSET,
2433 .gpiomask = 1 << 21, 2433 .gpiomask = 1 << 21,
2434 .mpeg = SAA7134_MPEG_DVB,
2434 .inputs = {{ 2435 .inputs = {{
2435 .name = name_tv, 2436 .name = name_tv,
2436 .vmux = 1, 2437 .vmux = 1,
@@ -2864,13 +2865,18 @@ struct pci_device_id saa7134_pci_tbl[] = {
2864 .subvendor = 0x1421, 2865 .subvendor = 0x1421,
2865 .subdevice = 0x0350, /* PCI version */ 2866 .subdevice = 0x0350, /* PCI version */
2866 .driver_data = SAA7134_BOARD_ADS_INSTANT_TV, 2867 .driver_data = SAA7134_BOARD_ADS_INSTANT_TV,
2867
2868 },{ 2868 },{
2869 .vendor = PCI_VENDOR_ID_PHILIPS, 2869 .vendor = PCI_VENDOR_ID_PHILIPS,
2870 .device = PCI_DEVICE_ID_PHILIPS_SAA7133, 2870 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2871 .subvendor = 0x1421, 2871 .subvendor = 0x1421,
2872 .subdevice = 0x0370, /* cardbus version */ 2872 .subdevice = 0x0370, /* cardbus version */
2873 .driver_data = SAA7134_BOARD_ADS_INSTANT_TV, 2873 .driver_data = SAA7134_BOARD_ADS_INSTANT_TV,
2874 },{
2875 .vendor = PCI_VENDOR_ID_PHILIPS,
2876 .device = PCI_DEVICE_ID_PHILIPS_SAA7133,
2877 .subvendor = 0x1421,
2878 .subdevice = 0x1370, /* cardbus version */
2879 .driver_data = SAA7134_BOARD_ADS_INSTANT_TV,
2874 2880
2875 },{ /* Typhoon DVB-T Duo Digital/Analog Cardbus */ 2881 },{ /* Typhoon DVB-T Duo Digital/Analog Cardbus */
2876 .vendor = PCI_VENDOR_ID_PHILIPS, 2882 .vendor = PCI_VENDOR_ID_PHILIPS,
@@ -3222,6 +3228,7 @@ int saa7134_board_init2(struct saa7134_dev *dev)
3222 } 3228 }
3223 break; 3229 break;
3224 case SAA7134_BOARD_PHILIPS_TIGER: 3230 case SAA7134_BOARD_PHILIPS_TIGER:
3231 case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
3225 /* this is a hybrid board, initialize to analog mode */ 3232 /* this is a hybrid board, initialize to analog mode */
3226 { 3233 {
3227 u8 data[] = { 0x3c, 0x33, 0x68}; 3234 u8 data[] = { 0x3c, 0x33, 0x68};
diff --git a/drivers/media/video/saa7134/saa7134-dvb.c b/drivers/media/video/saa7134/saa7134-dvb.c
index c0337cf91956..8545d30d9f70 100644
--- a/drivers/media/video/saa7134/saa7134-dvb.c
+++ b/drivers/media/video/saa7134/saa7134-dvb.c
@@ -880,6 +880,10 @@ static int dvb_init(struct saa7134_dev *dev)
880 dev->dvb.frontend = tda10046_attach(&philips_tiger_config, 880 dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
881 &dev->i2c_adap); 881 &dev->i2c_adap);
882 break; 882 break;
883 case SAA7134_BOARD_ASUSTeK_P7131_DUAL:
884 dev->dvb.frontend = tda10046_attach(&philips_tiger_config,
885 &dev->i2c_adap);
886 break;
883#endif 887#endif
884#ifdef HAVE_NXT200X 888#ifdef HAVE_NXT200X
885 case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: 889 case SAA7134_BOARD_AVERMEDIA_AVERTVHD_A180: