diff options
-rw-r--r-- | Documentation/video4linux/CARDLIST.bttv | 1 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv-cards.c | 17 | ||||
-rw-r--r-- | drivers/media/video/bt8xx/bttv.h | 1 |
3 files changed, 19 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv index 0d93fa1ac25e..4dfe62641374 100644 --- a/Documentation/video4linux/CARDLIST.bttv +++ b/Documentation/video4linux/CARDLIST.bttv | |||
@@ -154,3 +154,4 @@ | |||
154 | 153 -> PHYTEC VD-012 (bt878) | 154 | 153 -> PHYTEC VD-012 (bt878) |
155 | 154 -> PHYTEC VD-012-X1 (bt878) | 155 | 154 -> PHYTEC VD-012-X1 (bt878) |
156 | 155 -> PHYTEC VD-012-X2 (bt878) | 156 | 155 -> PHYTEC VD-012-X2 (bt878) |
157 | 156 -> IVCE-8784 [0000:f050,0001:f050,0002:f050,0003:f050] | ||
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c index d24dcc025e37..9dfd8c70e4fb 100644 --- a/drivers/media/video/bt8xx/bttv-cards.c +++ b/drivers/media/video/bt8xx/bttv-cards.c | |||
@@ -246,6 +246,10 @@ static struct CARD { | |||
246 | { 0xa182ff0d, BTTV_BOARD_IVC120, "IVC-120G" }, | 246 | { 0xa182ff0d, BTTV_BOARD_IVC120, "IVC-120G" }, |
247 | { 0xa182ff0e, BTTV_BOARD_IVC120, "IVC-120G" }, | 247 | { 0xa182ff0e, BTTV_BOARD_IVC120, "IVC-120G" }, |
248 | { 0xa182ff0f, BTTV_BOARD_IVC120, "IVC-120G" }, | 248 | { 0xa182ff0f, BTTV_BOARD_IVC120, "IVC-120G" }, |
249 | { 0xf0500000, BTTV_BOARD_IVCE8784, "IVCE-8784" }, | ||
250 | { 0xf0500001, BTTV_BOARD_IVCE8784, "IVCE-8784" }, | ||
251 | { 0xf0500002, BTTV_BOARD_IVCE8784, "IVCE-8784" }, | ||
252 | { 0xf0500003, BTTV_BOARD_IVCE8784, "IVCE-8784" }, | ||
249 | 253 | ||
250 | { 0x41424344, BTTV_BOARD_GRANDTEC, "GrandTec Multi Capture" }, | 254 | { 0x41424344, BTTV_BOARD_GRANDTEC, "GrandTec Multi Capture" }, |
251 | { 0x01020304, BTTV_BOARD_XGUARD, "Grandtec Grand X-Guard" }, | 255 | { 0x01020304, BTTV_BOARD_XGUARD, "Grandtec Grand X-Guard" }, |
@@ -2162,6 +2166,19 @@ struct tvcard bttv_tvcards[] = { | |||
2162 | .muxsel = { 2 }, | 2166 | .muxsel = { 2 }, |
2163 | .pll = PLL_28, | 2167 | .pll = PLL_28, |
2164 | }, | 2168 | }, |
2169 | [BTTV_BOARD_IVCE8784] = { | ||
2170 | .name = "IVCE-8784", | ||
2171 | .video_inputs = 1, | ||
2172 | .audio_inputs = 0, | ||
2173 | .tuner = UNSET, | ||
2174 | .tuner_type = UNSET, | ||
2175 | .tuner_addr = ADDR_UNSET, | ||
2176 | .radio_addr = ADDR_UNSET, | ||
2177 | .svhs = UNSET, | ||
2178 | .gpiomask = 0xdf, | ||
2179 | .muxsel = { 2 }, | ||
2180 | .pll = PLL_28, | ||
2181 | }, | ||
2165 | [BTTV_BOARD_XGUARD] = { | 2182 | [BTTV_BOARD_XGUARD] = { |
2166 | .name = "Grand X-Guard / Trust 814PCI", | 2183 | .name = "Grand X-Guard / Trust 814PCI", |
2167 | .video_inputs = 16, | 2184 | .video_inputs = 16, |
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h index 529bf6cf634d..a7bcad171823 100644 --- a/drivers/media/video/bt8xx/bttv.h +++ b/drivers/media/video/bt8xx/bttv.h | |||
@@ -180,6 +180,7 @@ | |||
180 | #define BTTV_BOARD_VD012 0x99 | 180 | #define BTTV_BOARD_VD012 0x99 |
181 | #define BTTV_BOARD_VD012_X1 0x9a | 181 | #define BTTV_BOARD_VD012_X1 0x9a |
182 | #define BTTV_BOARD_VD012_X2 0x9b | 182 | #define BTTV_BOARD_VD012_X2 0x9b |
183 | #define BTTV_BOARD_IVCE8784 0x9c | ||
183 | 184 | ||
184 | 185 | ||
185 | /* more card-specific defines */ | 186 | /* more card-specific defines */ |