aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@redhat.com>2008-11-19 09:10:50 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-29 14:53:35 -0500
commit8a5caa6bcb03b72db6c19a11e7b2de7656bd3f26 (patch)
treeda2771dd2db8b1d292bcefd639d2ac402a2f85ce /drivers/media/video/em28xx
parenta42aa191cc2b7573bdcf53023c4e9d5cfe91363e (diff)
V4L/DVB (9650): em28xx: replace magic numbers to something more meaningful
audio mux entries were described by 0 and 1 magic numers. Use an enum alias for each entry type. Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
Diffstat (limited to 'drivers/media/video/em28xx')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c252
1 files changed, 126 insertions, 126 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index d25d95c7d1ff..d73d6616d88d 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -58,7 +58,7 @@ struct em28xx_board em28xx_boards[] = {
58 .input = { { 58 .input = { {
59 .type = EM28XX_VMUX_COMPOSITE1, 59 .type = EM28XX_VMUX_COMPOSITE1,
60 .vmux = 0, 60 .vmux = 0,
61 .amux = 0, 61 .amux = EM28XX_AMUX_VIDEO,
62 } }, 62 } },
63 }, 63 },
64 [EM2800_BOARD_UNKNOWN] = { 64 [EM2800_BOARD_UNKNOWN] = {
@@ -70,11 +70,11 @@ struct em28xx_board em28xx_boards[] = {
70 .input = { { 70 .input = { {
71 .type = EM28XX_VMUX_COMPOSITE1, 71 .type = EM28XX_VMUX_COMPOSITE1,
72 .vmux = SAA7115_COMPOSITE0, 72 .vmux = SAA7115_COMPOSITE0,
73 .amux = 1, 73 .amux = EM28XX_AMUX_LINE_IN,
74 }, { 74 }, {
75 .type = EM28XX_VMUX_SVIDEO, 75 .type = EM28XX_VMUX_SVIDEO,
76 .vmux = SAA7115_SVIDEO3, 76 .vmux = SAA7115_SVIDEO3,
77 .amux = 1, 77 .amux = EM28XX_AMUX_LINE_IN,
78 } }, 78 } },
79 }, 79 },
80 [EM2820_BOARD_UNKNOWN] = { 80 [EM2820_BOARD_UNKNOWN] = {
@@ -90,7 +90,7 @@ struct em28xx_board em28xx_boards[] = {
90 .input = { { 90 .input = { {
91 .type = EM28XX_VMUX_COMPOSITE1, 91 .type = EM28XX_VMUX_COMPOSITE1,
92 .vmux = 0, 92 .vmux = 0,
93 .amux = 0, 93 .amux = EM28XX_AMUX_VIDEO,
94 } }, 94 } },
95 }, 95 },
96 [EM2820_BOARD_KWORLD_PVRTV2800RF] = { 96 [EM2820_BOARD_KWORLD_PVRTV2800RF] = {
@@ -103,11 +103,11 @@ struct em28xx_board em28xx_boards[] = {
103 .input = { { 103 .input = { {
104 .type = EM28XX_VMUX_COMPOSITE1, 104 .type = EM28XX_VMUX_COMPOSITE1,
105 .vmux = SAA7115_COMPOSITE0, 105 .vmux = SAA7115_COMPOSITE0,
106 .amux = 1, 106 .amux = EM28XX_AMUX_LINE_IN,
107 }, { 107 }, {
108 .type = EM28XX_VMUX_SVIDEO, 108 .type = EM28XX_VMUX_SVIDEO,
109 .vmux = SAA7115_SVIDEO3, 109 .vmux = SAA7115_SVIDEO3,
110 .amux = 1, 110 .amux = EM28XX_AMUX_LINE_IN,
111 } }, 111 } },
112 }, 112 },
113 [EM2820_BOARD_TERRATEC_CINERGY_250] = { 113 [EM2820_BOARD_TERRATEC_CINERGY_250] = {
@@ -119,15 +119,15 @@ struct em28xx_board em28xx_boards[] = {
119 .input = { { 119 .input = { {
120 .type = EM28XX_VMUX_TELEVISION, 120 .type = EM28XX_VMUX_TELEVISION,
121 .vmux = SAA7115_COMPOSITE2, 121 .vmux = SAA7115_COMPOSITE2,
122 .amux = 1, 122 .amux = EM28XX_AMUX_LINE_IN,
123 }, { 123 }, {
124 .type = EM28XX_VMUX_COMPOSITE1, 124 .type = EM28XX_VMUX_COMPOSITE1,
125 .vmux = SAA7115_COMPOSITE0, 125 .vmux = SAA7115_COMPOSITE0,
126 .amux = 1, 126 .amux = EM28XX_AMUX_LINE_IN,
127 }, { 127 }, {
128 .type = EM28XX_VMUX_SVIDEO, 128 .type = EM28XX_VMUX_SVIDEO,
129 .vmux = SAA7115_SVIDEO3, 129 .vmux = SAA7115_SVIDEO3,
130 .amux = 1, 130 .amux = EM28XX_AMUX_LINE_IN,
131 } }, 131 } },
132 }, 132 },
133 [EM2820_BOARD_PINNACLE_USB_2] = { 133 [EM2820_BOARD_PINNACLE_USB_2] = {
@@ -139,15 +139,15 @@ struct em28xx_board em28xx_boards[] = {
139 .input = { { 139 .input = { {
140 .type = EM28XX_VMUX_TELEVISION, 140 .type = EM28XX_VMUX_TELEVISION,
141 .vmux = SAA7115_COMPOSITE2, 141 .vmux = SAA7115_COMPOSITE2,
142 .amux = 0, 142 .amux = EM28XX_AMUX_VIDEO,
143 }, { 143 }, {
144 .type = EM28XX_VMUX_COMPOSITE1, 144 .type = EM28XX_VMUX_COMPOSITE1,
145 .vmux = SAA7115_COMPOSITE0, 145 .vmux = SAA7115_COMPOSITE0,
146 .amux = 1, 146 .amux = EM28XX_AMUX_LINE_IN,
147 }, { 147 }, {
148 .type = EM28XX_VMUX_SVIDEO, 148 .type = EM28XX_VMUX_SVIDEO,
149 .vmux = SAA7115_SVIDEO3, 149 .vmux = SAA7115_SVIDEO3,
150 .amux = 1, 150 .amux = EM28XX_AMUX_LINE_IN,
151 } }, 151 } },
152 }, 152 },
153 [EM2820_BOARD_HAUPPAUGE_WINTV_USB_2] = { 153 [EM2820_BOARD_HAUPPAUGE_WINTV_USB_2] = {
@@ -182,15 +182,15 @@ struct em28xx_board em28xx_boards[] = {
182 .input = { { 182 .input = { {
183 .type = EM28XX_VMUX_TELEVISION, 183 .type = EM28XX_VMUX_TELEVISION,
184 .vmux = SAA7115_COMPOSITE2, 184 .vmux = SAA7115_COMPOSITE2,
185 .amux = 1, 185 .amux = EM28XX_AMUX_LINE_IN,
186 }, { 186 }, {
187 .type = EM28XX_VMUX_COMPOSITE1, 187 .type = EM28XX_VMUX_COMPOSITE1,
188 .vmux = SAA7115_COMPOSITE0, 188 .vmux = SAA7115_COMPOSITE0,
189 .amux = 1, 189 .amux = EM28XX_AMUX_LINE_IN,
190 }, { 190 }, {
191 .type = EM28XX_VMUX_SVIDEO, 191 .type = EM28XX_VMUX_SVIDEO,
192 .vmux = SAA7115_SVIDEO3, 192 .vmux = SAA7115_SVIDEO3,
193 .amux = 1, 193 .amux = EM28XX_AMUX_LINE_IN,
194 } }, 194 } },
195 }, 195 },
196 [EM2820_BOARD_HERCULES_SMART_TV_USB2] = { 196 [EM2820_BOARD_HERCULES_SMART_TV_USB2] = {
@@ -203,15 +203,15 @@ struct em28xx_board em28xx_boards[] = {
203 .input = { { 203 .input = { {
204 .type = EM28XX_VMUX_TELEVISION, 204 .type = EM28XX_VMUX_TELEVISION,
205 .vmux = SAA7115_COMPOSITE2, 205 .vmux = SAA7115_COMPOSITE2,
206 .amux = 1, 206 .amux = EM28XX_AMUX_LINE_IN,
207 }, { 207 }, {
208 .type = EM28XX_VMUX_COMPOSITE1, 208 .type = EM28XX_VMUX_COMPOSITE1,
209 .vmux = SAA7115_COMPOSITE0, 209 .vmux = SAA7115_COMPOSITE0,
210 .amux = 1, 210 .amux = EM28XX_AMUX_LINE_IN,
211 }, { 211 }, {
212 .type = EM28XX_VMUX_SVIDEO, 212 .type = EM28XX_VMUX_SVIDEO,
213 .vmux = SAA7115_SVIDEO3, 213 .vmux = SAA7115_SVIDEO3,
214 .amux = 1, 214 .amux = EM28XX_AMUX_LINE_IN,
215 } }, 215 } },
216 }, 216 },
217 [EM2820_BOARD_PINNACLE_USB_2_FM1216ME] = { 217 [EM2820_BOARD_PINNACLE_USB_2_FM1216ME] = {
@@ -225,15 +225,15 @@ struct em28xx_board em28xx_boards[] = {
225 .input = { { 225 .input = { {
226 .type = EM28XX_VMUX_TELEVISION, 226 .type = EM28XX_VMUX_TELEVISION,
227 .vmux = SAA7115_COMPOSITE2, 227 .vmux = SAA7115_COMPOSITE2,
228 .amux = 0, 228 .amux = EM28XX_AMUX_VIDEO,
229 }, { 229 }, {
230 .type = EM28XX_VMUX_COMPOSITE1, 230 .type = EM28XX_VMUX_COMPOSITE1,
231 .vmux = SAA7115_COMPOSITE0, 231 .vmux = SAA7115_COMPOSITE0,
232 .amux = 1, 232 .amux = EM28XX_AMUX_LINE_IN,
233 }, { 233 }, {
234 .type = EM28XX_VMUX_SVIDEO, 234 .type = EM28XX_VMUX_SVIDEO,
235 .vmux = SAA7115_SVIDEO3, 235 .vmux = SAA7115_SVIDEO3,
236 .amux = 1, 236 .amux = EM28XX_AMUX_LINE_IN,
237 } }, 237 } },
238 }, 238 },
239 [EM2820_BOARD_GADMEI_UTV310] = { 239 [EM2820_BOARD_GADMEI_UTV310] = {
@@ -246,15 +246,15 @@ struct em28xx_board em28xx_boards[] = {
246 .input = { { 246 .input = { {
247 .type = EM28XX_VMUX_TELEVISION, 247 .type = EM28XX_VMUX_TELEVISION,
248 .vmux = SAA7115_COMPOSITE1, 248 .vmux = SAA7115_COMPOSITE1,
249 .amux = 1, 249 .amux = EM28XX_AMUX_LINE_IN,
250 }, { 250 }, {
251 .type = EM28XX_VMUX_COMPOSITE1, 251 .type = EM28XX_VMUX_COMPOSITE1,
252 .vmux = SAA7115_COMPOSITE0, 252 .vmux = SAA7115_COMPOSITE0,
253 .amux = 1, 253 .amux = EM28XX_AMUX_LINE_IN,
254 }, { 254 }, {
255 .type = EM28XX_VMUX_SVIDEO, 255 .type = EM28XX_VMUX_SVIDEO,
256 .vmux = SAA7115_SVIDEO3, 256 .vmux = SAA7115_SVIDEO3,
257 .amux = 1, 257 .amux = EM28XX_AMUX_LINE_IN,
258 } }, 258 } },
259 }, 259 },
260 [EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE] = { 260 [EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE] = {
@@ -267,15 +267,15 @@ struct em28xx_board em28xx_boards[] = {
267 .input = { { 267 .input = { {
268 .type = EM28XX_VMUX_TELEVISION, 268 .type = EM28XX_VMUX_TELEVISION,
269 .vmux = 2, 269 .vmux = 2,
270 .amux = 0, 270 .amux = EM28XX_AMUX_VIDEO,
271 }, { 271 }, {
272 .type = EM28XX_VMUX_COMPOSITE1, 272 .type = EM28XX_VMUX_COMPOSITE1,
273 .vmux = 0, 273 .vmux = 0,
274 .amux = 1, 274 .amux = EM28XX_AMUX_LINE_IN,
275 }, { 275 }, {
276 .type = EM28XX_VMUX_SVIDEO, 276 .type = EM28XX_VMUX_SVIDEO,
277 .vmux = 9, 277 .vmux = 9,
278 .amux = 1, 278 .amux = EM28XX_AMUX_LINE_IN,
279 } }, 279 } },
280 }, 280 },
281 [EM2820_BOARD_PINNACLE_DVC_100] = { 281 [EM2820_BOARD_PINNACLE_DVC_100] = {
@@ -286,11 +286,11 @@ struct em28xx_board em28xx_boards[] = {
286 .input = { { 286 .input = { {
287 .type = EM28XX_VMUX_COMPOSITE1, 287 .type = EM28XX_VMUX_COMPOSITE1,
288 .vmux = SAA7115_COMPOSITE0, 288 .vmux = SAA7115_COMPOSITE0,
289 .amux = 1, 289 .amux = EM28XX_AMUX_LINE_IN,
290 }, { 290 }, {
291 .type = EM28XX_VMUX_SVIDEO, 291 .type = EM28XX_VMUX_SVIDEO,
292 .vmux = SAA7115_SVIDEO3, 292 .vmux = SAA7115_SVIDEO3,
293 .amux = 1, 293 .amux = EM28XX_AMUX_LINE_IN,
294 } }, 294 } },
295 }, 295 },
296 [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = { 296 [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = {
@@ -300,7 +300,7 @@ struct em28xx_board em28xx_boards[] = {
300 .input = { { 300 .input = { {
301 .type = EM28XX_VMUX_COMPOSITE1, 301 .type = EM28XX_VMUX_COMPOSITE1,
302 .vmux = 0, 302 .vmux = 0,
303 .amux = 0, 303 .amux = EM28XX_AMUX_VIDEO,
304 } }, 304 } },
305 }, 305 },
306 [EM2821_BOARD_PROLINK_PLAYTV_USB2] = { 306 [EM2821_BOARD_PROLINK_PLAYTV_USB2] = {
@@ -314,15 +314,15 @@ struct em28xx_board em28xx_boards[] = {
314 .input = { { 314 .input = { {
315 .type = EM28XX_VMUX_TELEVISION, 315 .type = EM28XX_VMUX_TELEVISION,
316 .vmux = SAA7115_COMPOSITE2, 316 .vmux = SAA7115_COMPOSITE2,
317 .amux = 1, 317 .amux = EM28XX_AMUX_LINE_IN,
318 }, { 318 }, {
319 .type = EM28XX_VMUX_COMPOSITE1, 319 .type = EM28XX_VMUX_COMPOSITE1,
320 .vmux = SAA7115_COMPOSITE0, 320 .vmux = SAA7115_COMPOSITE0,
321 .amux = 1, 321 .amux = EM28XX_AMUX_LINE_IN,
322 }, { 322 }, {
323 .type = EM28XX_VMUX_SVIDEO, 323 .type = EM28XX_VMUX_SVIDEO,
324 .vmux = SAA7115_SVIDEO3, 324 .vmux = SAA7115_SVIDEO3,
325 .amux = 1, 325 .amux = EM28XX_AMUX_LINE_IN,
326 } }, 326 } },
327 }, 327 },
328 [EM2821_BOARD_SUPERCOMP_USB_2] = { 328 [EM2821_BOARD_SUPERCOMP_USB_2] = {
@@ -338,15 +338,15 @@ struct em28xx_board em28xx_boards[] = {
338 .input = { { 338 .input = { {
339 .type = EM28XX_VMUX_TELEVISION, 339 .type = EM28XX_VMUX_TELEVISION,
340 .vmux = SAA7115_COMPOSITE2, 340 .vmux = SAA7115_COMPOSITE2,
341 .amux = 1, 341 .amux = EM28XX_AMUX_LINE_IN,
342 }, { 342 }, {
343 .type = EM28XX_VMUX_COMPOSITE1, 343 .type = EM28XX_VMUX_COMPOSITE1,
344 .vmux = SAA7115_COMPOSITE0, 344 .vmux = SAA7115_COMPOSITE0,
345 .amux = 0, 345 .amux = EM28XX_AMUX_VIDEO,
346 }, { 346 }, {
347 .type = EM28XX_VMUX_SVIDEO, 347 .type = EM28XX_VMUX_SVIDEO,
348 .vmux = SAA7115_SVIDEO3, 348 .vmux = SAA7115_SVIDEO3,
349 .amux = 1, 349 .amux = EM28XX_AMUX_LINE_IN,
350 } }, 350 } },
351 }, 351 },
352 [EM2821_BOARD_USBGEAR_VD204] = { 352 [EM2821_BOARD_USBGEAR_VD204] = {
@@ -357,11 +357,11 @@ struct em28xx_board em28xx_boards[] = {
357 .input = { { 357 .input = { {
358 .type = EM28XX_VMUX_COMPOSITE1, 358 .type = EM28XX_VMUX_COMPOSITE1,
359 .vmux = SAA7115_COMPOSITE0, 359 .vmux = SAA7115_COMPOSITE0,
360 .amux = 1, 360 .amux = EM28XX_AMUX_LINE_IN,
361 }, { 361 }, {
362 .type = EM28XX_VMUX_SVIDEO, 362 .type = EM28XX_VMUX_SVIDEO,
363 .vmux = SAA7115_SVIDEO3, 363 .vmux = SAA7115_SVIDEO3,
364 .amux = 1, 364 .amux = EM28XX_AMUX_LINE_IN,
365 } }, 365 } },
366 }, 366 },
367 [EM2860_BOARD_NETGMBH_CAM] = { 367 [EM2860_BOARD_NETGMBH_CAM] = {
@@ -372,7 +372,7 @@ struct em28xx_board em28xx_boards[] = {
372 .input = { { 372 .input = { {
373 .type = EM28XX_VMUX_COMPOSITE1, 373 .type = EM28XX_VMUX_COMPOSITE1,
374 .vmux = 0, 374 .vmux = 0,
375 .amux = 0, 375 .amux = EM28XX_AMUX_VIDEO,
376 } }, 376 } },
377 }, 377 },
378 [EM2860_BOARD_TYPHOON_DVD_MAKER] = { 378 [EM2860_BOARD_TYPHOON_DVD_MAKER] = {
@@ -383,11 +383,11 @@ struct em28xx_board em28xx_boards[] = {
383 .input = { { 383 .input = { {
384 .type = EM28XX_VMUX_COMPOSITE1, 384 .type = EM28XX_VMUX_COMPOSITE1,
385 .vmux = SAA7115_COMPOSITE0, 385 .vmux = SAA7115_COMPOSITE0,
386 .amux = 1, 386 .amux = EM28XX_AMUX_LINE_IN,
387 }, { 387 }, {
388 .type = EM28XX_VMUX_SVIDEO, 388 .type = EM28XX_VMUX_SVIDEO,
389 .vmux = SAA7115_SVIDEO3, 389 .vmux = SAA7115_SVIDEO3,
390 .amux = 1, 390 .amux = EM28XX_AMUX_LINE_IN,
391 } }, 391 } },
392 }, 392 },
393 [EM2860_BOARD_GADMEI_UTV330] = { 393 [EM2860_BOARD_GADMEI_UTV330] = {
@@ -400,15 +400,15 @@ struct em28xx_board em28xx_boards[] = {
400 .input = { { 400 .input = { {
401 .type = EM28XX_VMUX_TELEVISION, 401 .type = EM28XX_VMUX_TELEVISION,
402 .vmux = SAA7115_COMPOSITE2, 402 .vmux = SAA7115_COMPOSITE2,
403 .amux = 0, 403 .amux = EM28XX_AMUX_VIDEO,
404 }, { 404 }, {
405 .type = EM28XX_VMUX_COMPOSITE1, 405 .type = EM28XX_VMUX_COMPOSITE1,
406 .vmux = SAA7115_COMPOSITE0, 406 .vmux = SAA7115_COMPOSITE0,
407 .amux = 1, 407 .amux = EM28XX_AMUX_LINE_IN,
408 }, { 408 }, {
409 .type = EM28XX_VMUX_SVIDEO, 409 .type = EM28XX_VMUX_SVIDEO,
410 .vmux = SAA7115_SVIDEO3, 410 .vmux = SAA7115_SVIDEO3,
411 .amux = 1, 411 .amux = EM28XX_AMUX_LINE_IN,
412 } }, 412 } },
413 }, 413 },
414 [EM2860_BOARD_TERRATEC_HYBRID_XS] = { 414 [EM2860_BOARD_TERRATEC_HYBRID_XS] = {
@@ -420,15 +420,15 @@ struct em28xx_board em28xx_boards[] = {
420 .input = { { 420 .input = { {
421 .type = EM28XX_VMUX_TELEVISION, 421 .type = EM28XX_VMUX_TELEVISION,
422 .vmux = TVP5150_COMPOSITE0, 422 .vmux = TVP5150_COMPOSITE0,
423 .amux = 0, 423 .amux = EM28XX_AMUX_VIDEO,
424 }, { 424 }, {
425 .type = EM28XX_VMUX_COMPOSITE1, 425 .type = EM28XX_VMUX_COMPOSITE1,
426 .vmux = TVP5150_COMPOSITE1, 426 .vmux = TVP5150_COMPOSITE1,
427 .amux = 1, 427 .amux = EM28XX_AMUX_LINE_IN,
428 }, { 428 }, {
429 .type = EM28XX_VMUX_SVIDEO, 429 .type = EM28XX_VMUX_SVIDEO,
430 .vmux = TVP5150_SVIDEO, 430 .vmux = TVP5150_SVIDEO,
431 .amux = 1, 431 .amux = EM28XX_AMUX_LINE_IN,
432 } }, 432 } },
433 }, 433 },
434 [EM2861_BOARD_KWORLD_PVRTV_300U] = { 434 [EM2861_BOARD_KWORLD_PVRTV_300U] = {
@@ -440,15 +440,15 @@ struct em28xx_board em28xx_boards[] = {
440 .input = { { 440 .input = { {
441 .type = EM28XX_VMUX_TELEVISION, 441 .type = EM28XX_VMUX_TELEVISION,
442 .vmux = TVP5150_COMPOSITE0, 442 .vmux = TVP5150_COMPOSITE0,
443 .amux = 0, 443 .amux = EM28XX_AMUX_VIDEO,
444 }, { 444 }, {
445 .type = EM28XX_VMUX_COMPOSITE1, 445 .type = EM28XX_VMUX_COMPOSITE1,
446 .vmux = TVP5150_COMPOSITE1, 446 .vmux = TVP5150_COMPOSITE1,
447 .amux = 1, 447 .amux = EM28XX_AMUX_LINE_IN,
448 }, { 448 }, {
449 .type = EM28XX_VMUX_SVIDEO, 449 .type = EM28XX_VMUX_SVIDEO,
450 .vmux = TVP5150_SVIDEO, 450 .vmux = TVP5150_SVIDEO,
451 .amux = 1, 451 .amux = EM28XX_AMUX_LINE_IN,
452 } }, 452 } },
453 }, 453 },
454 [EM2861_BOARD_YAKUMO_MOVIE_MIXER] = { 454 [EM2861_BOARD_YAKUMO_MOVIE_MIXER] = {
@@ -459,15 +459,15 @@ struct em28xx_board em28xx_boards[] = {
459 .input = { { 459 .input = { {
460 .type = EM28XX_VMUX_TELEVISION, 460 .type = EM28XX_VMUX_TELEVISION,
461 .vmux = TVP5150_COMPOSITE0, 461 .vmux = TVP5150_COMPOSITE0,
462 .amux = 0, 462 .amux = EM28XX_AMUX_VIDEO,
463 }, { 463 }, {
464 .type = EM28XX_VMUX_COMPOSITE1, 464 .type = EM28XX_VMUX_COMPOSITE1,
465 .vmux = TVP5150_COMPOSITE1, 465 .vmux = TVP5150_COMPOSITE1,
466 .amux = 1, 466 .amux = EM28XX_AMUX_LINE_IN,
467 }, { 467 }, {
468 .type = EM28XX_VMUX_SVIDEO, 468 .type = EM28XX_VMUX_SVIDEO,
469 .vmux = TVP5150_SVIDEO, 469 .vmux = TVP5150_SVIDEO,
470 .amux = 1, 470 .amux = EM28XX_AMUX_LINE_IN,
471 } }, 471 } },
472 }, 472 },
473 [EM2861_BOARD_PLEXTOR_PX_TV100U] = { 473 [EM2861_BOARD_PLEXTOR_PX_TV100U] = {
@@ -480,15 +480,15 @@ struct em28xx_board em28xx_boards[] = {
480 .input = { { 480 .input = { {
481 .type = EM28XX_VMUX_TELEVISION, 481 .type = EM28XX_VMUX_TELEVISION,
482 .vmux = TVP5150_COMPOSITE0, 482 .vmux = TVP5150_COMPOSITE0,
483 .amux = 1, 483 .amux = EM28XX_AMUX_LINE_IN,
484 }, { 484 }, {
485 .type = EM28XX_VMUX_COMPOSITE1, 485 .type = EM28XX_VMUX_COMPOSITE1,
486 .vmux = TVP5150_COMPOSITE1, 486 .vmux = TVP5150_COMPOSITE1,
487 .amux = 1, 487 .amux = EM28XX_AMUX_LINE_IN,
488 }, { 488 }, {
489 .type = EM28XX_VMUX_SVIDEO, 489 .type = EM28XX_VMUX_SVIDEO,
490 .vmux = TVP5150_SVIDEO, 490 .vmux = TVP5150_SVIDEO,
491 .amux = 1, 491 .amux = EM28XX_AMUX_LINE_IN,
492 } }, 492 } },
493 }, 493 },
494 [EM2870_BOARD_TERRATEC_XS] = { 494 [EM2870_BOARD_TERRATEC_XS] = {
@@ -530,15 +530,15 @@ struct em28xx_board em28xx_boards[] = {
530 .input = { { 530 .input = { {
531 .type = EM28XX_VMUX_TELEVISION, 531 .type = EM28XX_VMUX_TELEVISION,
532 .vmux = TVP5150_COMPOSITE0, 532 .vmux = TVP5150_COMPOSITE0,
533 .amux = 0, 533 .amux = EM28XX_AMUX_VIDEO,
534 }, { 534 }, {
535 .type = EM28XX_VMUX_COMPOSITE1, 535 .type = EM28XX_VMUX_COMPOSITE1,
536 .vmux = TVP5150_COMPOSITE1, 536 .vmux = TVP5150_COMPOSITE1,
537 .amux = 1, 537 .amux = EM28XX_AMUX_LINE_IN,
538 }, { 538 }, {
539 .type = EM28XX_VMUX_SVIDEO, 539 .type = EM28XX_VMUX_SVIDEO,
540 .vmux = TVP5150_SVIDEO, 540 .vmux = TVP5150_SVIDEO,
541 .amux = 1, 541 .amux = EM28XX_AMUX_LINE_IN,
542 } }, 542 } },
543 }, 543 },
544 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = { 544 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900] = {
@@ -552,15 +552,15 @@ struct em28xx_board em28xx_boards[] = {
552 .input = { { 552 .input = { {
553 .type = EM28XX_VMUX_TELEVISION, 553 .type = EM28XX_VMUX_TELEVISION,
554 .vmux = TVP5150_COMPOSITE0, 554 .vmux = TVP5150_COMPOSITE0,
555 .amux = 0, 555 .amux = EM28XX_AMUX_VIDEO,
556 }, { 556 }, {
557 .type = EM28XX_VMUX_COMPOSITE1, 557 .type = EM28XX_VMUX_COMPOSITE1,
558 .vmux = TVP5150_COMPOSITE1, 558 .vmux = TVP5150_COMPOSITE1,
559 .amux = 1, 559 .amux = EM28XX_AMUX_LINE_IN,
560 }, { 560 }, {
561 .type = EM28XX_VMUX_SVIDEO, 561 .type = EM28XX_VMUX_SVIDEO,
562 .vmux = TVP5150_SVIDEO, 562 .vmux = TVP5150_SVIDEO,
563 .amux = 1, 563 .amux = EM28XX_AMUX_LINE_IN,
564 } }, 564 } },
565 }, 565 },
566 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2] = { 566 [EM2880_BOARD_HAUPPAUGE_WINTV_HVR_900_R2] = {
@@ -573,7 +573,7 @@ struct em28xx_board em28xx_boards[] = {
573 .input = { { 573 .input = { {
574 .type = EM28XX_VMUX_TELEVISION, 574 .type = EM28XX_VMUX_TELEVISION,
575 .vmux = TVP5150_COMPOSITE0, 575 .vmux = TVP5150_COMPOSITE0,
576 .amux = 0, 576 .amux = EM28XX_AMUX_VIDEO,
577 }, { 577 }, {
578 .type = EM28XX_VMUX_COMPOSITE1, 578 .type = EM28XX_VMUX_COMPOSITE1,
579 .vmux = TVP5150_COMPOSITE1, 579 .vmux = TVP5150_COMPOSITE1,
@@ -581,7 +581,7 @@ struct em28xx_board em28xx_boards[] = {
581 }, { 581 }, {
582 .type = EM28XX_VMUX_SVIDEO, 582 .type = EM28XX_VMUX_SVIDEO,
583 .vmux = TVP5150_SVIDEO, 583 .vmux = TVP5150_SVIDEO,
584 .amux = 1, 584 .amux = EM28XX_AMUX_LINE_IN,
585 } }, 585 } },
586 }, 586 },
587 [EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950] = { 587 [EM2883_BOARD_HAUPPAUGE_WINTV_HVR_950] = {
@@ -597,15 +597,15 @@ struct em28xx_board em28xx_boards[] = {
597 .input = { { 597 .input = { {
598 .type = EM28XX_VMUX_TELEVISION, 598 .type = EM28XX_VMUX_TELEVISION,
599 .vmux = TVP5150_COMPOSITE0, 599 .vmux = TVP5150_COMPOSITE0,
600 .amux = 0, 600 .amux = EM28XX_AMUX_VIDEO,
601 }, { 601 }, {
602 .type = EM28XX_VMUX_COMPOSITE1, 602 .type = EM28XX_VMUX_COMPOSITE1,
603 .vmux = TVP5150_COMPOSITE1, 603 .vmux = TVP5150_COMPOSITE1,
604 .amux = 1, 604 .amux = EM28XX_AMUX_LINE_IN,
605 }, { 605 }, {
606 .type = EM28XX_VMUX_SVIDEO, 606 .type = EM28XX_VMUX_SVIDEO,
607 .vmux = TVP5150_SVIDEO, 607 .vmux = TVP5150_SVIDEO,
608 .amux = 1, 608 .amux = EM28XX_AMUX_LINE_IN,
609 } }, 609 } },
610 }, 610 },
611 [EM2880_BOARD_PINNACLE_PCTV_HD_PRO] = { 611 [EM2880_BOARD_PINNACLE_PCTV_HD_PRO] = {
@@ -621,15 +621,15 @@ struct em28xx_board em28xx_boards[] = {
621 .input = { { 621 .input = { {
622 .type = EM28XX_VMUX_TELEVISION, 622 .type = EM28XX_VMUX_TELEVISION,
623 .vmux = TVP5150_COMPOSITE0, 623 .vmux = TVP5150_COMPOSITE0,
624 .amux = 0, 624 .amux = EM28XX_AMUX_VIDEO,
625 }, { 625 }, {
626 .type = EM28XX_VMUX_COMPOSITE1, 626 .type = EM28XX_VMUX_COMPOSITE1,
627 .vmux = TVP5150_COMPOSITE1, 627 .vmux = TVP5150_COMPOSITE1,
628 .amux = 1, 628 .amux = EM28XX_AMUX_LINE_IN,
629 }, { 629 }, {
630 .type = EM28XX_VMUX_SVIDEO, 630 .type = EM28XX_VMUX_SVIDEO,
631 .vmux = TVP5150_SVIDEO, 631 .vmux = TVP5150_SVIDEO,
632 .amux = 1, 632 .amux = EM28XX_AMUX_LINE_IN,
633 } }, 633 } },
634 }, 634 },
635 [EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600] = { 635 [EM2880_BOARD_AMD_ATI_TV_WONDER_HD_600] = {
@@ -645,15 +645,15 @@ struct em28xx_board em28xx_boards[] = {
645 .input = { { 645 .input = { {
646 .type = EM28XX_VMUX_TELEVISION, 646 .type = EM28XX_VMUX_TELEVISION,
647 .vmux = TVP5150_COMPOSITE0, 647 .vmux = TVP5150_COMPOSITE0,
648 .amux = 0, 648 .amux = EM28XX_AMUX_VIDEO,
649 }, { 649 }, {
650 .type = EM28XX_VMUX_COMPOSITE1, 650 .type = EM28XX_VMUX_COMPOSITE1,
651 .vmux = TVP5150_COMPOSITE1, 651 .vmux = TVP5150_COMPOSITE1,
652 .amux = 1, 652 .amux = EM28XX_AMUX_LINE_IN,
653 }, { 653 }, {
654 .type = EM28XX_VMUX_SVIDEO, 654 .type = EM28XX_VMUX_SVIDEO,
655 .vmux = TVP5150_SVIDEO, 655 .vmux = TVP5150_SVIDEO,
656 .amux = 1, 656 .amux = EM28XX_AMUX_LINE_IN,
657 } }, 657 } },
658 }, 658 },
659 [EM2880_BOARD_TERRATEC_HYBRID_XS] = { 659 [EM2880_BOARD_TERRATEC_HYBRID_XS] = {
@@ -666,15 +666,15 @@ struct em28xx_board em28xx_boards[] = {
666 .input = { { 666 .input = { {
667 .type = EM28XX_VMUX_TELEVISION, 667 .type = EM28XX_VMUX_TELEVISION,
668 .vmux = TVP5150_COMPOSITE0, 668 .vmux = TVP5150_COMPOSITE0,
669 .amux = 0, 669 .amux = EM28XX_AMUX_VIDEO,
670 }, { 670 }, {
671 .type = EM28XX_VMUX_COMPOSITE1, 671 .type = EM28XX_VMUX_COMPOSITE1,
672 .vmux = TVP5150_COMPOSITE1, 672 .vmux = TVP5150_COMPOSITE1,
673 .amux = 1, 673 .amux = EM28XX_AMUX_LINE_IN,
674 }, { 674 }, {
675 .type = EM28XX_VMUX_SVIDEO, 675 .type = EM28XX_VMUX_SVIDEO,
676 .vmux = TVP5150_SVIDEO, 676 .vmux = TVP5150_SVIDEO,
677 .amux = 1, 677 .amux = EM28XX_AMUX_LINE_IN,
678 } }, 678 } },
679 }, 679 },
680 /* maybe there's a reason behind it why Terratec sells the Hybrid XS 680 /* maybe there's a reason behind it why Terratec sells the Hybrid XS
@@ -689,15 +689,15 @@ struct em28xx_board em28xx_boards[] = {
689 .input = { { 689 .input = { {
690 .type = EM28XX_VMUX_TELEVISION, 690 .type = EM28XX_VMUX_TELEVISION,
691 .vmux = TVP5150_COMPOSITE0, 691 .vmux = TVP5150_COMPOSITE0,
692 .amux = 0, 692 .amux = EM28XX_AMUX_VIDEO,
693 }, { 693 }, {
694 .type = EM28XX_VMUX_COMPOSITE1, 694 .type = EM28XX_VMUX_COMPOSITE1,
695 .vmux = TVP5150_COMPOSITE1, 695 .vmux = TVP5150_COMPOSITE1,
696 .amux = 1, 696 .amux = EM28XX_AMUX_LINE_IN,
697 }, { 697 }, {
698 .type = EM28XX_VMUX_SVIDEO, 698 .type = EM28XX_VMUX_SVIDEO,
699 .vmux = TVP5150_SVIDEO, 699 .vmux = TVP5150_SVIDEO,
700 .amux = 1, 700 .amux = EM28XX_AMUX_LINE_IN,
701 } }, 701 } },
702 }, 702 },
703 [EM2820_BOARD_MSI_VOX_USB_2] = { 703 [EM2820_BOARD_MSI_VOX_USB_2] = {
@@ -713,15 +713,15 @@ struct em28xx_board em28xx_boards[] = {
713 .input = { { 713 .input = { {
714 .type = EM28XX_VMUX_TELEVISION, 714 .type = EM28XX_VMUX_TELEVISION,
715 .vmux = SAA7115_COMPOSITE4, 715 .vmux = SAA7115_COMPOSITE4,
716 .amux = 0, 716 .amux = EM28XX_AMUX_VIDEO,
717 }, { 717 }, {
718 .type = EM28XX_VMUX_COMPOSITE1, 718 .type = EM28XX_VMUX_COMPOSITE1,
719 .vmux = SAA7115_COMPOSITE0, 719 .vmux = SAA7115_COMPOSITE0,
720 .amux = 1, 720 .amux = EM28XX_AMUX_LINE_IN,
721 }, { 721 }, {
722 .type = EM28XX_VMUX_SVIDEO, 722 .type = EM28XX_VMUX_SVIDEO,
723 .vmux = SAA7115_SVIDEO3, 723 .vmux = SAA7115_SVIDEO3,
724 .amux = 1, 724 .amux = EM28XX_AMUX_LINE_IN,
725 } }, 725 } },
726 }, 726 },
727 [EM2800_BOARD_TERRATEC_CINERGY_200] = { 727 [EM2800_BOARD_TERRATEC_CINERGY_200] = {
@@ -734,15 +734,15 @@ struct em28xx_board em28xx_boards[] = {
734 .input = { { 734 .input = { {
735 .type = EM28XX_VMUX_TELEVISION, 735 .type = EM28XX_VMUX_TELEVISION,
736 .vmux = SAA7115_COMPOSITE2, 736 .vmux = SAA7115_COMPOSITE2,
737 .amux = 0, 737 .amux = EM28XX_AMUX_VIDEO,
738 }, { 738 }, {
739 .type = EM28XX_VMUX_COMPOSITE1, 739 .type = EM28XX_VMUX_COMPOSITE1,
740 .vmux = SAA7115_COMPOSITE0, 740 .vmux = SAA7115_COMPOSITE0,
741 .amux = 1, 741 .amux = EM28XX_AMUX_LINE_IN,
742 }, { 742 }, {
743 .type = EM28XX_VMUX_SVIDEO, 743 .type = EM28XX_VMUX_SVIDEO,
744 .vmux = SAA7115_SVIDEO3, 744 .vmux = SAA7115_SVIDEO3,
745 .amux = 1, 745 .amux = EM28XX_AMUX_LINE_IN,
746 } }, 746 } },
747 }, 747 },
748 [EM2800_BOARD_GRABBEEX_USB2800] = { 748 [EM2800_BOARD_GRABBEEX_USB2800] = {
@@ -753,11 +753,11 @@ struct em28xx_board em28xx_boards[] = {
753 .input = { { 753 .input = { {
754 .type = EM28XX_VMUX_COMPOSITE1, 754 .type = EM28XX_VMUX_COMPOSITE1,
755 .vmux = SAA7115_COMPOSITE0, 755 .vmux = SAA7115_COMPOSITE0,
756 .amux = 1, 756 .amux = EM28XX_AMUX_LINE_IN,
757 }, { 757 }, {
758 .type = EM28XX_VMUX_SVIDEO, 758 .type = EM28XX_VMUX_SVIDEO,
759 .vmux = SAA7115_SVIDEO3, 759 .vmux = SAA7115_SVIDEO3,
760 .amux = 1, 760 .amux = EM28XX_AMUX_LINE_IN,
761 } }, 761 } },
762 }, 762 },
763 [EM2800_BOARD_LEADTEK_WINFAST_USBII] = { 763 [EM2800_BOARD_LEADTEK_WINFAST_USBII] = {
@@ -770,15 +770,15 @@ struct em28xx_board em28xx_boards[] = {
770 .input = { { 770 .input = { {
771 .type = EM28XX_VMUX_TELEVISION, 771 .type = EM28XX_VMUX_TELEVISION,
772 .vmux = SAA7115_COMPOSITE2, 772 .vmux = SAA7115_COMPOSITE2,
773 .amux = 0, 773 .amux = EM28XX_AMUX_VIDEO,
774 }, { 774 }, {
775 .type = EM28XX_VMUX_COMPOSITE1, 775 .type = EM28XX_VMUX_COMPOSITE1,
776 .vmux = SAA7115_COMPOSITE0, 776 .vmux = SAA7115_COMPOSITE0,
777 .amux = 1, 777 .amux = EM28XX_AMUX_LINE_IN,
778 }, { 778 }, {
779 .type = EM28XX_VMUX_SVIDEO, 779 .type = EM28XX_VMUX_SVIDEO,
780 .vmux = SAA7115_SVIDEO3, 780 .vmux = SAA7115_SVIDEO3,
781 .amux = 1, 781 .amux = EM28XX_AMUX_LINE_IN,
782 } }, 782 } },
783 }, 783 },
784 [EM2800_BOARD_KWORLD_USB2800] = { 784 [EM2800_BOARD_KWORLD_USB2800] = {
@@ -791,15 +791,15 @@ struct em28xx_board em28xx_boards[] = {
791 .input = { { 791 .input = { {
792 .type = EM28XX_VMUX_TELEVISION, 792 .type = EM28XX_VMUX_TELEVISION,
793 .vmux = SAA7115_COMPOSITE2, 793 .vmux = SAA7115_COMPOSITE2,
794 .amux = 0, 794 .amux = EM28XX_AMUX_VIDEO,
795 }, { 795 }, {
796 .type = EM28XX_VMUX_COMPOSITE1, 796 .type = EM28XX_VMUX_COMPOSITE1,
797 .vmux = SAA7115_COMPOSITE0, 797 .vmux = SAA7115_COMPOSITE0,
798 .amux = 1, 798 .amux = EM28XX_AMUX_LINE_IN,
799 }, { 799 }, {
800 .type = EM28XX_VMUX_SVIDEO, 800 .type = EM28XX_VMUX_SVIDEO,
801 .vmux = SAA7115_SVIDEO3, 801 .vmux = SAA7115_SVIDEO3,
802 .amux = 1, 802 .amux = EM28XX_AMUX_LINE_IN,
803 } }, 803 } },
804 }, 804 },
805 [EM2820_BOARD_PINNACLE_DVC_90] = { 805 [EM2820_BOARD_PINNACLE_DVC_90] = {
@@ -810,11 +810,11 @@ struct em28xx_board em28xx_boards[] = {
810 .input = { { 810 .input = { {
811 .type = EM28XX_VMUX_COMPOSITE1, 811 .type = EM28XX_VMUX_COMPOSITE1,
812 .vmux = SAA7115_COMPOSITE0, 812 .vmux = SAA7115_COMPOSITE0,
813 .amux = 1, 813 .amux = EM28XX_AMUX_LINE_IN,
814 }, { 814 }, {
815 .type = EM28XX_VMUX_SVIDEO, 815 .type = EM28XX_VMUX_SVIDEO,
816 .vmux = SAA7115_SVIDEO3, 816 .vmux = SAA7115_SVIDEO3,
817 .amux = 1, 817 .amux = EM28XX_AMUX_LINE_IN,
818 } }, 818 } },
819 }, 819 },
820 [EM2800_BOARD_VGEAR_POCKETTV] = { 820 [EM2800_BOARD_VGEAR_POCKETTV] = {
@@ -827,15 +827,15 @@ struct em28xx_board em28xx_boards[] = {
827 .input = { { 827 .input = { {
828 .type = EM28XX_VMUX_TELEVISION, 828 .type = EM28XX_VMUX_TELEVISION,
829 .vmux = SAA7115_COMPOSITE2, 829 .vmux = SAA7115_COMPOSITE2,
830 .amux = 0, 830 .amux = EM28XX_AMUX_VIDEO,
831 }, { 831 }, {
832 .type = EM28XX_VMUX_COMPOSITE1, 832 .type = EM28XX_VMUX_COMPOSITE1,
833 .vmux = SAA7115_COMPOSITE0, 833 .vmux = SAA7115_COMPOSITE0,
834 .amux = 1, 834 .amux = EM28XX_AMUX_LINE_IN,
835 }, { 835 }, {
836 .type = EM28XX_VMUX_SVIDEO, 836 .type = EM28XX_VMUX_SVIDEO,
837 .vmux = SAA7115_SVIDEO3, 837 .vmux = SAA7115_SVIDEO3,
838 .amux = 1, 838 .amux = EM28XX_AMUX_LINE_IN,
839 } }, 839 } },
840 }, 840 },
841 [EM2820_BOARD_PROLINK_PLAYTV_USB2] = { 841 [EM2820_BOARD_PROLINK_PLAYTV_USB2] = {
@@ -868,7 +868,7 @@ struct em28xx_board em28xx_boards[] = {
868 .input = { { 868 .input = { {
869 .type = EM28XX_VMUX_SVIDEO, 869 .type = EM28XX_VMUX_SVIDEO,
870 .vmux = SAA7115_SVIDEO3, 870 .vmux = SAA7115_SVIDEO3,
871 .amux = 0, 871 .amux = EM28XX_AMUX_VIDEO,
872 } }, 872 } },
873 }, 873 },
874 [EM2880_BOARD_MSI_DIGIVOX_AD] = { 874 [EM2880_BOARD_MSI_DIGIVOX_AD] = {
@@ -880,15 +880,15 @@ struct em28xx_board em28xx_boards[] = {
880 .input = { { 880 .input = { {
881 .type = EM28XX_VMUX_TELEVISION, 881 .type = EM28XX_VMUX_TELEVISION,
882 .vmux = TVP5150_COMPOSITE0, 882 .vmux = TVP5150_COMPOSITE0,
883 .amux = 0, 883 .amux = EM28XX_AMUX_VIDEO,
884 }, { 884 }, {
885 .type = EM28XX_VMUX_COMPOSITE1, 885 .type = EM28XX_VMUX_COMPOSITE1,
886 .vmux = TVP5150_COMPOSITE1, 886 .vmux = TVP5150_COMPOSITE1,
887 .amux = 1, 887 .amux = EM28XX_AMUX_LINE_IN,
888 }, { 888 }, {
889 .type = EM28XX_VMUX_SVIDEO, 889 .type = EM28XX_VMUX_SVIDEO,
890 .vmux = TVP5150_SVIDEO, 890 .vmux = TVP5150_SVIDEO,
891 .amux = 1, 891 .amux = EM28XX_AMUX_LINE_IN,
892 } }, 892 } },
893 }, 893 },
894 [EM2880_BOARD_MSI_DIGIVOX_AD_II] = { 894 [EM2880_BOARD_MSI_DIGIVOX_AD_II] = {
@@ -900,15 +900,15 @@ struct em28xx_board em28xx_boards[] = {
900 .input = { { 900 .input = { {
901 .type = EM28XX_VMUX_TELEVISION, 901 .type = EM28XX_VMUX_TELEVISION,
902 .vmux = TVP5150_COMPOSITE0, 902 .vmux = TVP5150_COMPOSITE0,
903 .amux = 0, 903 .amux = EM28XX_AMUX_VIDEO,
904 }, { 904 }, {
905 .type = EM28XX_VMUX_COMPOSITE1, 905 .type = EM28XX_VMUX_COMPOSITE1,
906 .vmux = TVP5150_COMPOSITE1, 906 .vmux = TVP5150_COMPOSITE1,
907 .amux = 1, 907 .amux = EM28XX_AMUX_LINE_IN,
908 }, { 908 }, {
909 .type = EM28XX_VMUX_SVIDEO, 909 .type = EM28XX_VMUX_SVIDEO,
910 .vmux = TVP5150_SVIDEO, 910 .vmux = TVP5150_SVIDEO,
911 .amux = 1, 911 .amux = EM28XX_AMUX_LINE_IN,
912 } }, 912 } },
913 }, 913 },
914 [EM2880_BOARD_KWORLD_DVB_305U] = { 914 [EM2880_BOARD_KWORLD_DVB_305U] = {
@@ -920,15 +920,15 @@ struct em28xx_board em28xx_boards[] = {
920 .input = { { 920 .input = { {
921 .type = EM28XX_VMUX_TELEVISION, 921 .type = EM28XX_VMUX_TELEVISION,
922 .vmux = TVP5150_COMPOSITE0, 922 .vmux = TVP5150_COMPOSITE0,
923 .amux = 0, 923 .amux = EM28XX_AMUX_VIDEO,
924 }, { 924 }, {
925 .type = EM28XX_VMUX_COMPOSITE1, 925 .type = EM28XX_VMUX_COMPOSITE1,
926 .vmux = TVP5150_COMPOSITE1, 926 .vmux = TVP5150_COMPOSITE1,
927 .amux = 1, 927 .amux = EM28XX_AMUX_LINE_IN,
928 }, { 928 }, {
929 .type = EM28XX_VMUX_SVIDEO, 929 .type = EM28XX_VMUX_SVIDEO,
930 .vmux = TVP5150_SVIDEO, 930 .vmux = TVP5150_SVIDEO,
931 .amux = 1, 931 .amux = EM28XX_AMUX_LINE_IN,
932 } }, 932 } },
933 }, 933 },
934 [EM2880_BOARD_KWORLD_DVB_310U] = { 934 [EM2880_BOARD_KWORLD_DVB_310U] = {
@@ -961,15 +961,15 @@ struct em28xx_board em28xx_boards[] = {
961 .input = { { 961 .input = { {
962 .type = EM28XX_VMUX_TELEVISION, 962 .type = EM28XX_VMUX_TELEVISION,
963 .vmux = TVP5150_COMPOSITE0, 963 .vmux = TVP5150_COMPOSITE0,
964 .amux = 0, 964 .amux = EM28XX_AMUX_VIDEO,
965 }, { 965 }, {
966 .type = EM28XX_VMUX_COMPOSITE1, 966 .type = EM28XX_VMUX_COMPOSITE1,
967 .vmux = TVP5150_COMPOSITE1, 967 .vmux = TVP5150_COMPOSITE1,
968 .amux = 1, 968 .amux = EM28XX_AMUX_LINE_IN,
969 }, { 969 }, {
970 .type = EM28XX_VMUX_SVIDEO, 970 .type = EM28XX_VMUX_SVIDEO,
971 .vmux = TVP5150_SVIDEO, 971 .vmux = TVP5150_SVIDEO,
972 .amux = 1, 972 .amux = EM28XX_AMUX_LINE_IN,
973 } }, 973 } },
974 }, 974 },
975 [EM2881_BOARD_PINNACLE_HYBRID_PRO] = { 975 [EM2881_BOARD_PINNACLE_HYBRID_PRO] = {
@@ -981,15 +981,15 @@ struct em28xx_board em28xx_boards[] = {
981 .input = { { 981 .input = { {
982 .type = EM28XX_VMUX_TELEVISION, 982 .type = EM28XX_VMUX_TELEVISION,
983 .vmux = TVP5150_COMPOSITE0, 983 .vmux = TVP5150_COMPOSITE0,
984 .amux = 0, 984 .amux = EM28XX_AMUX_VIDEO,
985 }, { 985 }, {
986 .type = EM28XX_VMUX_COMPOSITE1, 986 .type = EM28XX_VMUX_COMPOSITE1,
987 .vmux = TVP5150_COMPOSITE1, 987 .vmux = TVP5150_COMPOSITE1,
988 .amux = 1, 988 .amux = EM28XX_AMUX_LINE_IN,
989 }, { 989 }, {
990 .type = EM28XX_VMUX_SVIDEO, 990 .type = EM28XX_VMUX_SVIDEO,
991 .vmux = TVP5150_SVIDEO, 991 .vmux = TVP5150_SVIDEO,
992 .amux = 1, 992 .amux = EM28XX_AMUX_LINE_IN,
993 } }, 993 } },
994 }, 994 },
995 [EM2882_BOARD_PINNACLE_HYBRID_PRO] = { 995 [EM2882_BOARD_PINNACLE_HYBRID_PRO] = {
@@ -1002,15 +1002,15 @@ struct em28xx_board em28xx_boards[] = {
1002 .input = { { 1002 .input = { {
1003 .type = EM28XX_VMUX_TELEVISION, 1003 .type = EM28XX_VMUX_TELEVISION,
1004 .vmux = TVP5150_COMPOSITE0, 1004 .vmux = TVP5150_COMPOSITE0,
1005 .amux = 0, 1005 .amux = EM28XX_AMUX_VIDEO,
1006 }, { 1006 }, {
1007 .type = EM28XX_VMUX_COMPOSITE1, 1007 .type = EM28XX_VMUX_COMPOSITE1,
1008 .vmux = TVP5150_COMPOSITE1, 1008 .vmux = TVP5150_COMPOSITE1,
1009 .amux = 1, 1009 .amux = EM28XX_AMUX_LINE_IN,
1010 }, { 1010 }, {
1011 .type = EM28XX_VMUX_SVIDEO, 1011 .type = EM28XX_VMUX_SVIDEO,
1012 .vmux = TVP5150_SVIDEO, 1012 .vmux = TVP5150_SVIDEO,
1013 .amux = 1, 1013 .amux = EM28XX_AMUX_LINE_IN,
1014 } }, 1014 } },
1015 }, 1015 },
1016 [EM2882_BOARD_KWORLD_VS_DVBT] = { 1016 [EM2882_BOARD_KWORLD_VS_DVBT] = {
@@ -1022,15 +1022,15 @@ struct em28xx_board em28xx_boards[] = {
1022 .input = { { 1022 .input = { {
1023 .type = EM28XX_VMUX_TELEVISION, 1023 .type = EM28XX_VMUX_TELEVISION,
1024 .vmux = TVP5150_COMPOSITE0, 1024 .vmux = TVP5150_COMPOSITE0,
1025 .amux = 0, 1025 .amux = EM28XX_AMUX_VIDEO,
1026 }, { 1026 }, {
1027 .type = EM28XX_VMUX_COMPOSITE1, 1027 .type = EM28XX_VMUX_COMPOSITE1,
1028 .vmux = TVP5150_COMPOSITE1, 1028 .vmux = TVP5150_COMPOSITE1,
1029 .amux = 1, 1029 .amux = EM28XX_AMUX_LINE_IN,
1030 }, { 1030 }, {
1031 .type = EM28XX_VMUX_SVIDEO, 1031 .type = EM28XX_VMUX_SVIDEO,
1032 .vmux = TVP5150_SVIDEO, 1032 .vmux = TVP5150_SVIDEO,
1033 .amux = 1, 1033 .amux = EM28XX_AMUX_LINE_IN,
1034 } }, 1034 } },
1035 }, 1035 },
1036 [EM2882_BOARD_TERRATEC_HYBRID_XS] = { 1036 [EM2882_BOARD_TERRATEC_HYBRID_XS] = {
@@ -1042,15 +1042,15 @@ struct em28xx_board em28xx_boards[] = {
1042 .input = { { 1042 .input = { {
1043 .type = EM28XX_VMUX_TELEVISION, 1043 .type = EM28XX_VMUX_TELEVISION,
1044 .vmux = TVP5150_COMPOSITE0, 1044 .vmux = TVP5150_COMPOSITE0,
1045 .amux = 0, 1045 .amux = EM28XX_AMUX_VIDEO,
1046 }, { 1046 }, {
1047 .type = EM28XX_VMUX_COMPOSITE1, 1047 .type = EM28XX_VMUX_COMPOSITE1,
1048 .vmux = TVP5150_COMPOSITE1, 1048 .vmux = TVP5150_COMPOSITE1,
1049 .amux = 1, 1049 .amux = EM28XX_AMUX_LINE_IN,
1050 }, { 1050 }, {
1051 .type = EM28XX_VMUX_SVIDEO, 1051 .type = EM28XX_VMUX_SVIDEO,
1052 .vmux = TVP5150_SVIDEO, 1052 .vmux = TVP5150_SVIDEO,
1053 .amux = 1, 1053 .amux = EM28XX_AMUX_LINE_IN,
1054 } }, 1054 } },
1055 }, 1055 },
1056 [EM2883_BOARD_KWORLD_HYBRID_A316] = { 1056 [EM2883_BOARD_KWORLD_HYBRID_A316] = {
@@ -1063,15 +1063,15 @@ struct em28xx_board em28xx_boards[] = {
1063 .input = { { 1063 .input = { {
1064 .type = EM28XX_VMUX_TELEVISION, 1064 .type = EM28XX_VMUX_TELEVISION,
1065 .vmux = TVP5150_COMPOSITE0, 1065 .vmux = TVP5150_COMPOSITE0,
1066 .amux = 0, 1066 .amux = EM28XX_AMUX_VIDEO,
1067 }, { 1067 }, {
1068 .type = EM28XX_VMUX_COMPOSITE1, 1068 .type = EM28XX_VMUX_COMPOSITE1,
1069 .vmux = TVP5150_COMPOSITE1, 1069 .vmux = TVP5150_COMPOSITE1,
1070 .amux = 1, 1070 .amux = EM28XX_AMUX_LINE_IN,
1071 }, { 1071 }, {
1072 .type = EM28XX_VMUX_SVIDEO, 1072 .type = EM28XX_VMUX_SVIDEO,
1073 .vmux = TVP5150_SVIDEO, 1073 .vmux = TVP5150_SVIDEO,
1074 .amux = 1, 1074 .amux = EM28XX_AMUX_LINE_IN,
1075 } }, 1075 } },
1076 }, 1076 },
1077 [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = { 1077 [EM2820_BOARD_COMPRO_VIDEOMATE_FORYOU] = {