diff options
| -rw-r--r-- | linux/Documentation/video4linux/README.saa7134 | 9 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134-cards.c | 18 | ||||
| -rw-r--r-- | linux/drivers/media/video/saa7134/saa7134.h | 6 | ||||
| -rw-r--r-- | v4l/ChangeLog | 6 |
4 files changed, 27 insertions, 12 deletions
diff --git a/linux/Documentation/video4linux/README.saa7134 b/linux/Documentation/video4linux/README.saa7134 index 1a446c653..c838df6b0 100644 --- a/linux/Documentation/video4linux/README.saa7134 +++ b/linux/Documentation/video4linux/README.saa7134 @@ -57,6 +57,15 @@ Cards can use either of these two crystals (xtal): - 24.576MHz -> .audio_clock=0x200000 (xtal * .audio_clock = 51539600) +Some details about 30/34/35: + + - saa7130 - low-price chip, doesn't have mute, that is why all those + cards should have .mute field defined in their tuner structure. + + - saa7134 - usual chip + + - saa7133/35 - saa7135 is probably a marketing decision, since all those + chips identifies itself as 33 on pci. Credits ======= diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c index 7c4a8ed97..4f3084080 100644 --- a/linux/drivers/media/video/saa7134/saa7134-cards.c +++ b/linux/drivers/media/video/saa7134/saa7134-cards.c @@ -1,6 +1,6 @@ /* - * $Id: saa7134-cards.c,v 1.60 2005/06/13 08:42:51 nsh Exp $ + * $Id: saa7134-cards.c,v 1.61 2005/06/13 08:53:07 nsh Exp $ * * device driver for philips saa7134 based TV cards * card-specific stuff. @@ -587,7 +587,7 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE1, }, }, - [SAA7135_BOARD_ASUSTeK_TVFM7135] = { + [SAA7134_BOARD_ASUSTeK_TVFM7135] = { .name = "ASUS TV-FM 7135", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_TDA8290, @@ -1105,7 +1105,7 @@ struct saa7134_board saa7134_boards[] = { .amux = LINE1, }, }, - [SAA7133_BOARD_UPMOST_PURPLE_TV] = { + [SAA7134_BOARD_UPMOST_PURPLE_TV] = { .name = "UPMOST PURPLE TV", .audio_clock = 0x00187de7, .tuner_type = TUNER_PHILIPS_FM1236_MK3, @@ -1760,7 +1760,7 @@ struct pci_device_id saa7134_pci_tbl[] = { .driver_data = SAA7134_BOARD_FLYVIDEO2000, },{ .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7135, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x5168, .subdevice = 0x0212, /* minipci, LR212 */ .driver_data = SAA7134_BOARD_FLYTVPLATINUM_MINI, @@ -1802,10 +1802,10 @@ struct pci_device_id saa7134_pci_tbl[] = { .driver_data = SAA7134_BOARD_ASUSTeK_TVFM7134, },{ .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7135, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = PCI_VENDOR_ID_ASUSTEK, .subdevice = 0x4845, - .driver_data = SAA7135_BOARD_ASUSTeK_TVFM7135, + .driver_data = SAA7134_BOARD_ASUSTeK_TVFM7135, },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7134, @@ -1939,7 +1939,7 @@ struct pci_device_id saa7134_pci_tbl[] = { .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x12ab, .subdevice = 0x0800, - .driver_data = SAA7133_BOARD_UPMOST_PURPLE_TV, + .driver_data = SAA7134_BOARD_UPMOST_PURPLE_TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS, .device = PCI_DEVICE_ID_PHILIPS_SAA7130, @@ -1998,14 +1998,14 @@ struct pci_device_id saa7134_pci_tbl[] = { },{ .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7135, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x1421, .subdevice = 0x0350, /* PCI version */ .driver_data = SAA7134_BOARD_ADS_INSTANT_TV, },{ .vendor = PCI_VENDOR_ID_PHILIPS, - .device = PCI_DEVICE_ID_PHILIPS_SAA7135, + .device = PCI_DEVICE_ID_PHILIPS_SAA7133, .subvendor = 0x1421, .subdevice = 0x0370, /* cardbus version */ .driver_data = SAA7134_BOARD_ADS_INSTANT_TV, diff --git a/linux/drivers/media/video/saa7134/saa7134.h b/linux/drivers/media/video/saa7134/saa7134.h index cdfb6a5e5..256e9ed17 100644 --- a/linux/drivers/media/video/saa7134/saa7134.h +++ b/linux/drivers/media/video/saa7134/saa7134.h @@ -1,5 +1,5 @@ /* - * $Id: saa7134.h,v 1.42 2005/06/13 08:42:51 nsh Exp $ + * $Id: saa7134.h,v 1.43 2005/06/13 08:53:07 nsh Exp $ * * v4l2 device driver for philips saa7134 based TV cards * @@ -167,7 +167,7 @@ struct saa7134_format { #define SAA7134_BOARD_AVERMEDIA_DVD_EZMAKER 33 #define SAA7134_BOARD_NOVAC_PRIMETV7133 34 #define SAA7134_BOARD_AVERMEDIA_STUDIO_305 35 -#define SAA7133_BOARD_UPMOST_PURPLE_TV 36 +#define SAA7134_BOARD_UPMOST_PURPLE_TV 36 #define SAA7134_BOARD_ITEMS_MTV005 37 #define SAA7134_BOARD_CINERGY200 38 #define SAA7134_BOARD_FLYTVPLATINUM_MINI 39 @@ -184,7 +184,7 @@ struct saa7134_format { #define SAA7134_BOARD_PINNACLE_300I_DVBT_PAL 50 #define SAA7134_BOARD_PROVIDEO_PV952 51 #define SAA7134_BOARD_AVERMEDIA_305 52 -#define SAA7135_BOARD_ASUSTeK_TVFM7135 53 +#define SAA7134_BOARD_ASUSTeK_TVFM7135 53 #define SAA7134_BOARD_FLYTVPLATINUM_FM 54 #define SAA7134_BOARD_FLYDVBTDUO 55 #define SAA7134_BOARD_AVERMEDIA_307 56 diff --git a/v4l/ChangeLog b/v4l/ChangeLog index 3fbe6cf8e..ed30da499 100644 --- a/v4l/ChangeLog +++ b/v4l/ChangeLog @@ -1,3 +1,9 @@ +2005-06-13 13:00 nshmyrev + * saa7134-cards.c, caa7134.h, doc/README.saa7134: + + Mark all 7135 cards as 7133. Thanks to + hermann pitton <hermann.pitton@onlinehome.de> + 2005-06-13 12:38 nshmyrev * saa7134-cards.c, saa7134-dvb.c, saa7134.h: |