提交 835ab012 编写于 作者: H Hans Verkuil 提交者: Mauro Carvalho Chehab

[media] bttv: Add Adlink MPG24 entry to the bttv cardlist

Add a proper card entry for this device, rather than abusing entries that are
not-quite-right.
Regards,
	Hans
Signed-off-by: NHans Verkuil <hans.verkuil@cisco.com>
Signed-off-by: NMauro Carvalho Chehab <mchehab@redhat.com>
上级 31857e54
...@@ -160,3 +160,4 @@ ...@@ -160,3 +160,4 @@
159 -> ProVideo PV183 [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540] 159 -> ProVideo PV183 [1830:1540,1831:1540,1832:1540,1833:1540,1834:1540,1835:1540,1836:1540,1837:1540]
160 -> Tongwei Video Technology TD-3116 [f200:3116] 160 -> Tongwei Video Technology TD-3116 [f200:3116]
161 -> Aposonic W-DVR [0279:0228] 161 -> Aposonic W-DVR [0279:0228]
162 -> Adlink MPG24
...@@ -2705,7 +2705,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2705,7 +2705,7 @@ struct tvcard bttv_tvcards[] = {
.has_radio = 1, .has_radio = 1,
.has_remote = 1, .has_remote = 1,
}, },
[BTTV_BOARD_VD012] = { [BTTV_BOARD_VD012] = {
/* D.Heer@Phytec.de */ /* D.Heer@Phytec.de */
.name = "PHYTEC VD-012 (bt878)", .name = "PHYTEC VD-012 (bt878)",
.video_inputs = 4, .video_inputs = 4,
...@@ -2718,7 +2718,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2718,7 +2718,7 @@ struct tvcard bttv_tvcards[] = {
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
[BTTV_BOARD_VD012_X1] = { [BTTV_BOARD_VD012_X1] = {
/* D.Heer@Phytec.de */ /* D.Heer@Phytec.de */
.name = "PHYTEC VD-012-X1 (bt878)", .name = "PHYTEC VD-012-X1 (bt878)",
.video_inputs = 4, .video_inputs = 4,
...@@ -2731,7 +2731,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2731,7 +2731,7 @@ struct tvcard bttv_tvcards[] = {
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
[BTTV_BOARD_VD012_X2] = { [BTTV_BOARD_VD012_X2] = {
/* D.Heer@Phytec.de */ /* D.Heer@Phytec.de */
.name = "PHYTEC VD-012-X2 (bt878)", .name = "PHYTEC VD-012-X2 (bt878)",
.video_inputs = 4, .video_inputs = 4,
...@@ -2744,7 +2744,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2744,7 +2744,7 @@ struct tvcard bttv_tvcards[] = {
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
[BTTV_BOARD_GEOVISION_GV800S] = { [BTTV_BOARD_GEOVISION_GV800S] = {
/* Bruno Christo <bchristo@inf.ufsm.br> /* Bruno Christo <bchristo@inf.ufsm.br>
* *
* GeoVision GV-800(S) has 4 Conexant Fusion 878A: * GeoVision GV-800(S) has 4 Conexant Fusion 878A:
...@@ -2771,7 +2771,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2771,7 +2771,7 @@ struct tvcard bttv_tvcards[] = {
.no_tda7432 = 1, .no_tda7432 = 1,
.muxsel_hook = gv800s_muxsel, .muxsel_hook = gv800s_muxsel,
}, },
[BTTV_BOARD_GEOVISION_GV800S_SL] = { [BTTV_BOARD_GEOVISION_GV800S_SL] = {
/* Bruno Christo <bchristo@inf.ufsm.br> /* Bruno Christo <bchristo@inf.ufsm.br>
* *
* GeoVision GV-800(S) has 4 Conexant Fusion 878A: * GeoVision GV-800(S) has 4 Conexant Fusion 878A:
...@@ -2808,6 +2808,7 @@ struct tvcard bttv_tvcards[] = { ...@@ -2808,6 +2808,7 @@ struct tvcard bttv_tvcards[] = {
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
.tuner_addr = ADDR_UNSET, .tuner_addr = ADDR_UNSET,
}, },
/* ---- card 0xa0---------------------------------- */
[BTTV_BOARD_TVT_TD3116] = { [BTTV_BOARD_TVT_TD3116] = {
.name = "Tongwei Video Technology TD-3116", .name = "Tongwei Video Technology TD-3116",
.video_inputs = 16, .video_inputs = 16,
...@@ -2825,6 +2826,17 @@ struct tvcard bttv_tvcards[] = { ...@@ -2825,6 +2826,17 @@ struct tvcard bttv_tvcards[] = {
.muxsel = MUXSEL(2, 3, 1, 0), .muxsel = MUXSEL(2, 3, 1, 0),
.tuner_type = TUNER_ABSENT, .tuner_type = TUNER_ABSENT,
}, },
[BTTV_BOARD_ADLINK_MPG24] = {
/* Adlink MPG24 */
.name = "Adlink MPG24",
.video_inputs = 1,
/* .audio_inputs= 1, */
.svhs = NO_SVHS,
.muxsel = MUXSEL(2, 2, 2, 2),
.tuner_type = UNSET,
.tuner_addr = ADDR_UNSET,
.pll = PLL_28,
},
}; };
......
...@@ -185,6 +185,7 @@ ...@@ -185,6 +185,7 @@
#define BTTV_BOARD_PV183 0x9f #define BTTV_BOARD_PV183 0x9f
#define BTTV_BOARD_TVT_TD3116 0xa0 #define BTTV_BOARD_TVT_TD3116 0xa0
#define BTTV_BOARD_APOSONIC_WDVR 0xa1 #define BTTV_BOARD_APOSONIC_WDVR 0xa1
#define BTTV_BOARD_ADLINK_MPG24 0xa2
/* more card-specific defines */ /* more card-specific defines */
#define PT2254_L_CHANNEL 0x10 #define PT2254_L_CHANNEL 0x10
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册