aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorTony Gentile <tony@squid-vision.com>2012-07-19 08:36:33 -0400
committerMauro Carvalho Chehab <mchehab@redhat.com>2012-07-30 22:10:14 -0400
commit9d2952d70f175193b609929427a88a62eaa381bb (patch)
tree1bbf1447855d66811678301c6330172854db02b3
parentc854d8883fec59332f0662917f8c94dcfb1c405d (diff)
[media] bttv: add support for Aposonic W-DVR
Forwarded-by: Gerd Hoffmann <kraxel@bytesex.org> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.bttv1
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c10
-rw-r--r--drivers/media/video/bt8xx/bttv.h2
3 files changed, 11 insertions, 2 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index b753906c7183..581f666a76cf 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -159,3 +159,4 @@
159158 -> Geovision GV-800(S) (slave) [800b:763d,800c:763d,800d:763d] 159158 -> Geovision GV-800(S) (slave) [800b:763d,800c:763d,800d:763d]
160159 -> ProVideo PV183 [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540] 160159 -> ProVideo PV183 [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]
161160 -> Tongwei Video Technology TD-3116 [f200:3116] 161160 -> Tongwei Video Technology TD-3116 [f200:3116]
162161 -> Aposonic W-DVR [0279:0228]
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 5f3a00c2c4f6..38952faaffda 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -345,7 +345,7 @@ static struct CARD {
345 { 0x15401836, BTTV_BOARD_PV183, "Provideo PV183-7" }, 345 { 0x15401836, BTTV_BOARD_PV183, "Provideo PV183-7" },
346 { 0x15401837, BTTV_BOARD_PV183, "Provideo PV183-8" }, 346 { 0x15401837, BTTV_BOARD_PV183, "Provideo PV183-8" },
347 { 0x3116f200, BTTV_BOARD_TVT_TD3116, "Tongwei Video Technology TD-3116" }, 347 { 0x3116f200, BTTV_BOARD_TVT_TD3116, "Tongwei Video Technology TD-3116" },
348 348 { 0x02280279, BTTV_BOARD_APOSONIC_WDVR, "Aposonic W-DVR" },
349 { 0, -1, NULL } 349 { 0, -1, NULL }
350}; 350};
351 351
@@ -2818,6 +2818,14 @@ struct tvcard bttv_tvcards[] = {
2818 .pll = PLL_28, 2818 .pll = PLL_28,
2819 .tuner_type = TUNER_ABSENT, 2819 .tuner_type = TUNER_ABSENT,
2820 }, 2820 },
2821 [BTTV_BOARD_APOSONIC_WDVR] = {
2822 .name = "Aposonic W-DVR",
2823 .video_inputs = 4,
2824 .svhs = NO_SVHS,
2825 .muxsel = MUXSEL(2, 3, 1, 0),
2826 .tuner_type = TUNER_ABSENT,
2827 },
2828
2821}; 2829};
2822 2830
2823static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards); 2831static const unsigned int bttv_num_tvcards = ARRAY_SIZE(bttv_tvcards);
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index acfe2f3b92d9..79a11240a590 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -184,7 +184,7 @@
184#define BTTV_BOARD_GEOVISION_GV800S_SL 0x9e 184#define BTTV_BOARD_GEOVISION_GV800S_SL 0x9e
185#define BTTV_BOARD_PV183 0x9f 185#define BTTV_BOARD_PV183 0x9f
186#define BTTV_BOARD_TVT_TD3116 0xa0 186#define BTTV_BOARD_TVT_TD3116 0xa0
187 187#define BTTV_BOARD_APOSONIC_WDVR 0xa1
188 188
189/* more card-specific defines */ 189/* more card-specific defines */
190#define PT2254_L_CHANNEL 0x10 190#define PT2254_L_CHANNEL 0x10