aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/bt8xx
diff options
context:
space:
mode:
authorPeter De Schrijver <p2@psychaos.be>2011-11-06 08:47:58 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2011-11-08 08:22:24 -0500
commitc540d9f13d1f0f6913434b0b8241bb6270818769 (patch)
treed833dd575a08d42c342bfbb5bdb9a7e3cdf02745 /drivers/media/video/bt8xx
parentde2843b663fd621e9a6c75fed4da73e8c9a1b094 (diff)
[media] bt8xx: add support for PCI device ID 0x36c
add support for conexant PCI device 0x36c. Seems to be fully compatible with the currently supported chips, yet the chip has different PCI ID. Signed-off-by: Peter De Schrijver <p2@psychaos.be> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/bt8xx')
-rw-r--r--drivers/media/video/bt8xx/bt848.h5
-rw-r--r--drivers/media/video/bt8xx/bttv-driver.c1
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/video/bt8xx/bt848.h b/drivers/media/video/bt8xx/bt848.h
index 0bcd95303bb0..c37e6acffded 100644
--- a/drivers/media/video/bt8xx/bt848.h
+++ b/drivers/media/video/bt8xx/bt848.h
@@ -30,6 +30,10 @@
30#ifndef PCI_DEVICE_ID_BT849 30#ifndef PCI_DEVICE_ID_BT849
31#define PCI_DEVICE_ID_BT849 0x351 31#define PCI_DEVICE_ID_BT849 0x351
32#endif 32#endif
33#ifndef PCI_DEVICE_ID_FUSION879
34#define PCI_DEVICE_ID_FUSION879 0x36c
35#endif
36
33#ifndef PCI_DEVICE_ID_BT878 37#ifndef PCI_DEVICE_ID_BT878
34#define PCI_DEVICE_ID_BT878 0x36e 38#define PCI_DEVICE_ID_BT878 0x36e
35#endif 39#endif
@@ -37,7 +41,6 @@
37#define PCI_DEVICE_ID_BT879 0x36f 41#define PCI_DEVICE_ID_BT879 0x36f
38#endif 42#endif
39 43
40
41/* Brooktree 848 registers */ 44/* Brooktree 848 registers */
42 45
43#define BT848_DSTATUS 0x000 46#define BT848_DSTATUS 0x000
diff --git a/drivers/media/video/bt8xx/bttv-driver.c b/drivers/media/video/bt8xx/bttv-driver.c
index 3dd06607aec2..76c301f05095 100644
--- a/drivers/media/video/bt8xx/bttv-driver.c
+++ b/drivers/media/video/bt8xx/bttv-driver.c
@@ -4572,6 +4572,7 @@ static struct pci_device_id bttv_pci_tbl[] = {
4572 {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0}, 4572 {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT849), 0},
4573 {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0}, 4573 {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT878), 0},
4574 {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0}, 4574 {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_BT879), 0},
4575 {PCI_VDEVICE(BROOKTREE, PCI_DEVICE_ID_FUSION879), 0},
4575 {0,} 4576 {0,}
4576}; 4577};
4577 4578