summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMichael Krufky <mkrufky@linuxtv.org>2007-10-08 15:13:02 -0400
committerMichael Krufky <mkrufky@linuxtv.org>2007-10-08 15:13:02 -0400
commitc9d709ac188c873e72d08bcfc50978e05a3b5026 (patch)
tree6a64dee26ef3b2a1139262fcf92bfe0607a55a29
parentbee12cc3dc8cc34a30ff03b084b809f5bfbb2217 (diff)
downloadmediapointer-dvb-s2-c9d709ac188c873e72d08bcfc50978e05a3b5026.tar.gz
mediapointer-dvb-s2-c9d709ac188c873e72d08bcfc50978e05a3b5026.tar.bz2
saa7134: add autodetection for KWorld ATSC-115
From: Eric Sandeen <sandeen@sandeen.net> Recognize the KWorld ATSC115 PCI ID as a hardware clone of the ATSC110. Signed-off-by: Eric Sandeen <sandeen@sandeen.net> Signed-off-by: Michael Krufky <mkrufky@linuxtv.org>
-rw-r--r--linux/Documentation/video4linux/CARDLIST.saa71342
-rw-r--r--linux/drivers/media/video/saa7134/saa7134-cards.c8
2 files changed, 8 insertions, 2 deletions
diff --git a/linux/Documentation/video4linux/CARDLIST.saa7134 b/linux/Documentation/video4linux/CARDLIST.saa7134
index 67f08cc4b..a14545300 100644
--- a/linux/Documentation/video4linux/CARDLIST.saa7134
+++ b/linux/Documentation/video4linux/CARDLIST.saa7134
@@ -88,7 +88,7 @@
87 -> ADS Instant TV Duo Cardbus PTV331 [0331:1421]
88 -> Tevion/KWorld DVB-T 220RF [17de:7201]
89 -> ELSA EX-VISION 700TV [1048:226c]
- 90 -> Kworld ATSC110 [17de:7350]
+ 90 -> Kworld ATSC110/115 [17de:7350,17de:7352]
91 -> AVerMedia A169 B [1461:7360]
92 -> AVerMedia A169 B1 [1461:6360]
93 -> Medion 7134 Bridge #2 [16be:0005]
diff --git a/linux/drivers/media/video/saa7134/saa7134-cards.c b/linux/drivers/media/video/saa7134/saa7134-cards.c
index 95a542010..797436b9a 100644
--- a/linux/drivers/media/video/saa7134/saa7134-cards.c
+++ b/linux/drivers/media/video/saa7134/saa7134-cards.c
@@ -2822,7 +2822,7 @@ struct saa7134_board saa7134_boards[] = {
},
},
[SAA7134_BOARD_KWORLD_ATSC110] = {
- .name = "Kworld ATSC110",
+ .name = "Kworld ATSC110/115",
.audio_clock = 0x00187de7,
.tuner_type = TUNER_PHILIPS_TUV1236D,
.radio_type = UNSET,
@@ -4123,6 +4123,12 @@ struct pci_device_id saa7134_pci_tbl[] = {
.driver_data = SAA7134_BOARD_KWORLD_ATSC110,
},{
.vendor = PCI_VENDOR_ID_PHILIPS,
+ .device = PCI_DEVICE_ID_PHILIPS_SAA7133, /* SAA7135HL */
+ .subvendor = 0x17de,
+ .subdevice = 0x7352,
+ .driver_data = SAA7134_BOARD_KWORLD_ATSC110, /* ATSC 115 */
+ },{
+ .vendor = PCI_VENDOR_ID_PHILIPS,
.device = PCI_DEVICE_ID_PHILIPS_SAA7134,
.subvendor = 0x1461,
.subdevice = 0x7360,