aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--Documentation/video4linux/CARDLIST.bttv7
-rw-r--r--drivers/media/video/bt8xx/bttv-cards.c60
-rw-r--r--drivers/media/video/bt8xx/bttv.h8
3 files changed, 65 insertions, 10 deletions
diff --git a/Documentation/video4linux/CARDLIST.bttv b/Documentation/video4linux/CARDLIST.bttv
index 60ba66836038..0d93fa1ac25e 100644
--- a/Documentation/video4linux/CARDLIST.bttv
+++ b/Documentation/video4linux/CARDLIST.bttv
@@ -104,8 +104,8 @@
104103 -> Grand X-Guard / Trust 814PCI [0304:0102] 104103 -> Grand X-Guard / Trust 814PCI [0304:0102]
105104 -> Nebula Electronics DigiTV [0071:0101] 105104 -> Nebula Electronics DigiTV [0071:0101]
106105 -> ProVideo PV143 [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433] 106105 -> ProVideo PV143 [aa00:1430,aa00:1431,aa00:1432,aa00:1433,aa03:1433]
107106 -> PHYTEC VD-009-X1 MiniDIN (bt878) 107106 -> PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)
108107 -> PHYTEC VD-009-X1 Combi (bt878) 108107 -> PHYTEC VD-009-X1 VD-011 Combi (bt878)
109108 -> PHYTEC VD-009 MiniDIN (bt878) 109108 -> PHYTEC VD-009 MiniDIN (bt878)
110109 -> PHYTEC VD-009 Combi (bt878) 110109 -> PHYTEC VD-009 Combi (bt878)
111110 -> IVC-100 [ff00:a132] 111110 -> IVC-100 [ff00:a132]
@@ -151,3 +151,6 @@
151150 -> Geovision GV-600 [008a:763c] 151150 -> Geovision GV-600 [008a:763c]
152151 -> Kozumi KTV-01C 152151 -> Kozumi KTV-01C
153152 -> Encore ENL TV-FM-2 [1000:1801] 153152 -> Encore ENL TV-FM-2 [1000:1801]
154153 -> PHYTEC VD-012 (bt878)
155154 -> PHYTEC VD-012-X1 (bt878)
156155 -> PHYTEC VD-012-X2 (bt878)
diff --git a/drivers/media/video/bt8xx/bttv-cards.c b/drivers/media/video/bt8xx/bttv-cards.c
index 13742b0bbe3e..8629b77666f6 100644
--- a/drivers/media/video/bt8xx/bttv-cards.c
+++ b/drivers/media/video/bt8xx/bttv-cards.c
@@ -2217,9 +2217,9 @@ struct tvcard bttv_tvcards[] = {
2217 .tuner_addr = ADDR_UNSET, 2217 .tuner_addr = ADDR_UNSET,
2218 .radio_addr = ADDR_UNSET, 2218 .radio_addr = ADDR_UNSET,
2219 }, 2219 },
2220 [BTTV_BOARD_VD009X1_MINIDIN] = { 2220 [BTTV_BOARD_VD009X1_VD011_MINIDIN] = {
2221 /* M.Klahr@phytec.de */ 2221 /* M.Klahr@phytec.de */
2222 .name = "PHYTEC VD-009-X1 MiniDIN (bt878)", 2222 .name = "PHYTEC VD-009-X1 VD-011 MiniDIN (bt878)",
2223 .video_inputs = 4, 2223 .video_inputs = 4,
2224 .audio_inputs = 0, 2224 .audio_inputs = 0,
2225 .tuner = UNSET, /* card has no tuner */ 2225 .tuner = UNSET, /* card has no tuner */
@@ -2227,14 +2227,14 @@ struct tvcard bttv_tvcards[] = {
2227 .gpiomask = 0x00, 2227 .gpiomask = 0x00,
2228 .muxsel = { 2, 3, 1, 0 }, 2228 .muxsel = { 2, 3, 1, 0 },
2229 .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ 2229 .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
2230 .needs_tvaudio = 1, 2230 .needs_tvaudio = 0,
2231 .pll = PLL_28, 2231 .pll = PLL_28,
2232 .tuner_type = UNSET, 2232 .tuner_type = UNSET,
2233 .tuner_addr = ADDR_UNSET, 2233 .tuner_addr = ADDR_UNSET,
2234 .radio_addr = ADDR_UNSET, 2234 .radio_addr = ADDR_UNSET,
2235 }, 2235 },
2236 [BTTV_BOARD_VD009X1_COMBI] = { 2236 [BTTV_BOARD_VD009X1_VD011_COMBI] = {
2237 .name = "PHYTEC VD-009-X1 Combi (bt878)", 2237 .name = "PHYTEC VD-009-X1 VD-011 Combi (bt878)",
2238 .video_inputs = 4, 2238 .video_inputs = 4,
2239 .audio_inputs = 0, 2239 .audio_inputs = 0,
2240 .tuner = UNSET, /* card has no tuner */ 2240 .tuner = UNSET, /* card has no tuner */
@@ -2242,7 +2242,7 @@ struct tvcard bttv_tvcards[] = {
2242 .gpiomask = 0x00, 2242 .gpiomask = 0x00,
2243 .muxsel = { 2, 3, 1, 1 }, 2243 .muxsel = { 2, 3, 1, 1 },
2244 .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */ 2244 .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
2245 .needs_tvaudio = 1, 2245 .needs_tvaudio = 0,
2246 .pll = PLL_28, 2246 .pll = PLL_28,
2247 .tuner_type = UNSET, 2247 .tuner_type = UNSET,
2248 .tuner_addr = ADDR_UNSET, 2248 .tuner_addr = ADDR_UNSET,
@@ -3061,6 +3061,54 @@ struct tvcard bttv_tvcards[] = {
3061 .pll = PLL_28, 3061 .pll = PLL_28,
3062 .has_radio = 1, 3062 .has_radio = 1,
3063 .has_remote = 1, 3063 .has_remote = 1,
3064 },
3065 [BTTV_BOARD_VD012] = {
3066 /* D.Heer@Phytec.de */
3067 .name = "PHYTEC VD-012 (bt878)",
3068 .video_inputs = 4,
3069 .audio_inputs = 0,
3070 .tuner = UNSET, /* card has no tuner */
3071 .svhs = UNSET, /* card has no s-video */
3072 .gpiomask = 0x00,
3073 .muxsel = { 0, 2, 3, 1 },
3074 .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
3075 .needs_tvaudio = 0,
3076 .pll = PLL_28,
3077 .tuner_type = UNSET,
3078 .tuner_addr = ADDR_UNSET,
3079 .radio_addr = ADDR_UNSET,
3080 },
3081 [BTTV_BOARD_VD012_X1] = {
3082 /* D.Heer@Phytec.de */
3083 .name = "PHYTEC VD-012-X1 (bt878)",
3084 .video_inputs = 4,
3085 .audio_inputs = 0,
3086 .tuner = UNSET, /* card has no tuner */
3087 .svhs = 3,
3088 .gpiomask = 0x00,
3089 .muxsel = { 2, 3, 1 },
3090 .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
3091 .needs_tvaudio = 0,
3092 .pll = PLL_28,
3093 .tuner_type = UNSET,
3094 .tuner_addr = ADDR_UNSET,
3095 .radio_addr = ADDR_UNSET,
3096 },
3097 [BTTV_BOARD_VD012_X2] = {
3098 /* D.Heer@Phytec.de */
3099 .name = "PHYTEC VD-012-X2 (bt878)",
3100 .video_inputs = 4,
3101 .audio_inputs = 0,
3102 .tuner = UNSET, /* card has no tuner */
3103 .svhs = 3,
3104 .gpiomask = 0x00,
3105 .muxsel = { 3, 2, 1 },
3106 .gpiomux = { 0, 0, 0, 0 }, /* card has no audio */
3107 .needs_tvaudio = 0,
3108 .pll = PLL_28,
3109 .tuner_type = UNSET,
3110 .tuner_addr = ADDR_UNSET,
3111 .radio_addr = ADDR_UNSET,
3064 } 3112 }
3065}; 3113};
3066 3114
diff --git a/drivers/media/video/bt8xx/bttv.h b/drivers/media/video/bt8xx/bttv.h
index bc2c88499ab9..529bf6cf634d 100644
--- a/drivers/media/video/bt8xx/bttv.h
+++ b/drivers/media/video/bt8xx/bttv.h
@@ -130,8 +130,8 @@
130#define BTTV_BOARD_XGUARD 0x67 130#define BTTV_BOARD_XGUARD 0x67
131#define BTTV_BOARD_NEBULA_DIGITV 0x68 131#define BTTV_BOARD_NEBULA_DIGITV 0x68
132#define BTTV_BOARD_PV143 0x69 132#define BTTV_BOARD_PV143 0x69
133#define BTTV_BOARD_VD009X1_MINIDIN 0x6a 133#define BTTV_BOARD_VD009X1_VD011_MINIDIN 0x6a
134#define BTTV_BOARD_VD009X1_COMBI 0x6b 134#define BTTV_BOARD_VD009X1_VD011_COMBI 0x6b
135#define BTTV_BOARD_VD009_MINIDIN 0x6c 135#define BTTV_BOARD_VD009_MINIDIN 0x6c
136#define BTTV_BOARD_VD009_COMBI 0x6d 136#define BTTV_BOARD_VD009_COMBI 0x6d
137#define BTTV_BOARD_IVC100 0x6e 137#define BTTV_BOARD_IVC100 0x6e
@@ -177,6 +177,10 @@
177#define BTTV_BOARD_GEOVISION_GV600 0x96 177#define BTTV_BOARD_GEOVISION_GV600 0x96
178#define BTTV_BOARD_KOZUMI_KTV_01C 0x97 178#define BTTV_BOARD_KOZUMI_KTV_01C 0x97
179#define BTTV_BOARD_ENLTV_FM_2 0x98 179#define BTTV_BOARD_ENLTV_FM_2 0x98
180#define BTTV_BOARD_VD012 0x99
181#define BTTV_BOARD_VD012_X1 0x9a
182#define BTTV_BOARD_VD012_X2 0x9b
183
180 184
181/* more card-specific defines */ 185/* more card-specific defines */
182#define PT2254_L_CHANNEL 0x10 186#define PT2254_L_CHANNEL 0x10
generated by cgit v1.2.2 (git 2.25.0) at 2024-12-26 11:03:41 -0500