aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/pci/saa7134
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-05 07:24:37 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-10 04:23:42 -0500
commit8fc3486783f1571c7d836d397c8ff4fa2ca6457c (patch)
tree22670a3a50fec82c2bf7dd73fc25d973addc6f1b /drivers/media/pci/saa7134
parent2773b0e9baa68beed1f93d04a8ae8ca04b35a60d (diff)
[media] saa7134: use input types, instead of hardcoding strings
Currently, the saa7134 driver is hardcoding input names on each board entry. More modern drivers define, instead, an enum for each input type. While the current logic works, it adds extra complexity at the driver, as it needs to discover the type of the input using some euristics. Instead, let's standardize the input types and use a type, instead of a name on all places. That will allow further patches to properly report the input type via VIDIOC_G_INPUT and to remove an extra field from the struct to identify if the input is for TV. Please notice that several boards define an input for receiving composite signals via a S-Video connector. The name of such input was inconsistent, so this patch cleans it and make it to be properly reported the same way for all boards. Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci/saa7134')
-rw-r--r--drivers/media/pci/saa7134/saa7134-cards.c1619
-rw-r--r--drivers/media/pci/saa7134/saa7134-core.c2
-rw-r--r--drivers/media/pci/saa7134/saa7134-tvaudio.c13
-rw-r--r--drivers/media/pci/saa7134/saa7134-video.c11
-rw-r--r--drivers/media/pci/saa7134/saa7134.h33
5 files changed, 853 insertions, 825 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index 29d2094c42a0..19975cec5da7 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -36,17 +36,23 @@
36#include "xc5000.h" 36#include "xc5000.h"
37#include "s5h1411.h" 37#include "s5h1411.h"
38 38
39/* commly used strings */ 39/* Input names */
40static char name_mute[] = "mute"; 40const char * const saa7134_input_name[] = {
41static char name_radio[] = "Radio"; 41 [SAA7134_INPUT_MUTE] = "mute",
42static char name_tv[] = "Television"; 42 [SAA7134_INPUT_RADIO] = "Radio",
43static char name_tv_mono[] = "TV (mono only)"; 43 [SAA7134_INPUT_TV] = "Television",
44static char name_comp[] = "Composite"; 44 [SAA7134_INPUT_TV_MONO] = "TV (mono only)",
45static char name_comp1[] = "Composite1"; 45 [SAA7134_INPUT_COMPOSITE] = "Composite",
46static char name_comp2[] = "Composite2"; 46 [SAA7134_INPUT_COMPOSITE0] = "Composite0",
47static char name_comp3[] = "Composite3"; 47 [SAA7134_INPUT_COMPOSITE1] = "Composite1",
48static char name_comp4[] = "Composite4"; 48 [SAA7134_INPUT_COMPOSITE2] = "Composite2",
49static char name_svideo[] = "S-Video"; 49 [SAA7134_INPUT_COMPOSITE3] = "Composite3",
50 [SAA7134_INPUT_COMPOSITE4] = "Composite4",
51 [SAA7134_INPUT_SVIDEO] = "S-Video",
52 [SAA7134_INPUT_SVIDEO0] = "S-Video0",
53 [SAA7134_INPUT_SVIDEO1] = "S-Video1",
54 [SAA7134_INPUT_COMPOSITE_OVER_SVIDEO] = "Composite over S-Video",
55};
50 56
51/* ------------------------------------------------------------------ */ 57/* ------------------------------------------------------------------ */
52/* board config info */ 58/* board config info */
@@ -69,7 +75,7 @@ struct saa7134_board saa7134_boards[] = {
69 .radio_addr = ADDR_UNSET, 75 .radio_addr = ADDR_UNSET,
70 76
71 .inputs = {{ 77 .inputs = {{
72 .name = "default", 78 .type = SAA7134_INPUT_COMPOSITE,
73 .vmux = 0, 79 .vmux = 0,
74 .amux = LINE1, 80 .amux = LINE1,
75 }}, 81 }},
@@ -84,22 +90,22 @@ struct saa7134_board saa7134_boards[] = {
84 .radio_addr = ADDR_UNSET, 90 .radio_addr = ADDR_UNSET,
85 91
86 .inputs = {{ 92 .inputs = {{
87 .name = name_comp1, 93 .type = SAA7134_INPUT_COMPOSITE1,
88 .vmux = 0, 94 .vmux = 0,
89 .amux = LINE1, 95 .amux = LINE1,
90 },{ 96 },{
91 .name = name_tv, 97 .type = SAA7134_INPUT_TV,
92 .vmux = 1, 98 .vmux = 1,
93 .amux = TV, 99 .amux = TV,
94 .tv = 1, 100 .tv = 1,
95 },{ 101 },{
96 .name = name_tv_mono, 102 .type = SAA7134_INPUT_TV_MONO,
97 .vmux = 1, 103 .vmux = 1,
98 .amux = LINE2, 104 .amux = LINE2,
99 .tv = 1, 105 .tv = 1,
100 }}, 106 }},
101 .radio = { 107 .radio = {
102 .name = name_radio, 108 .type = SAA7134_INPUT_RADIO,
103 .amux = LINE2, 109 .amux = LINE2,
104 }, 110 },
105 }, 111 },
@@ -114,40 +120,40 @@ struct saa7134_board saa7134_boards[] = {
114 120
115 .gpiomask = 0xe000, 121 .gpiomask = 0xe000,
116 .inputs = {{ 122 .inputs = {{
117 .name = name_tv, 123 .type = SAA7134_INPUT_TV,
118 .vmux = 1, 124 .vmux = 1,
119 .amux = TV, 125 .amux = TV,
120 .gpio = 0x8000, 126 .gpio = 0x8000,
121 .tv = 1, 127 .tv = 1,
122 },{ 128 },{
123 .name = name_tv_mono, 129 .type = SAA7134_INPUT_TV_MONO,
124 .vmux = 1, 130 .vmux = 1,
125 .amux = LINE2, 131 .amux = LINE2,
126 .gpio = 0x0000, 132 .gpio = 0x0000,
127 .tv = 1, 133 .tv = 1,
128 },{ 134 },{
129 .name = name_comp1, 135 .type = SAA7134_INPUT_COMPOSITE1,
130 .vmux = 0, 136 .vmux = 0,
131 .amux = LINE2, 137 .amux = LINE2,
132 .gpio = 0x4000, 138 .gpio = 0x4000,
133 },{ 139 },{
134 .name = name_comp2, 140 .type = SAA7134_INPUT_COMPOSITE2,
135 .vmux = 3, 141 .vmux = 3,
136 .amux = LINE2, 142 .amux = LINE2,
137 .gpio = 0x4000, 143 .gpio = 0x4000,
138 },{ 144 },{
139 .name = name_svideo, 145 .type = SAA7134_INPUT_SVIDEO,
140 .vmux = 8, 146 .vmux = 8,
141 .amux = LINE2, 147 .amux = LINE2,
142 .gpio = 0x4000, 148 .gpio = 0x4000,
143 }}, 149 }},
144 .radio = { 150 .radio = {
145 .name = name_radio, 151 .type = SAA7134_INPUT_RADIO,
146 .amux = LINE2, 152 .amux = LINE2,
147 .gpio = 0x2000, 153 .gpio = 0x2000,
148 }, 154 },
149 .mute = { 155 .mute = {
150 .name = name_mute, 156 .type = SAA7134_INPUT_MUTE,
151 .amux = TV, 157 .amux = TV,
152 .gpio = 0x8000, 158 .gpio = 0x8000,
153 }, 159 },
@@ -163,34 +169,34 @@ struct saa7134_board saa7134_boards[] = {
163 169
164 .gpiomask = 0xe000, 170 .gpiomask = 0xe000,
165 .inputs = {{ 171 .inputs = {{
166 .name = name_tv, 172 .type = SAA7134_INPUT_TV,
167 .vmux = 1, 173 .vmux = 1,
168 .amux = LINE2, 174 .amux = LINE2,
169 .gpio = 0x0000, 175 .gpio = 0x0000,
170 .tv = 1, 176 .tv = 1,
171 },{ 177 },{
172 .name = name_comp1, 178 .type = SAA7134_INPUT_COMPOSITE1,
173 .vmux = 0, 179 .vmux = 0,
174 .amux = LINE2, 180 .amux = LINE2,
175 .gpio = 0x4000, 181 .gpio = 0x4000,
176 },{ 182 },{
177 .name = name_comp2, 183 .type = SAA7134_INPUT_COMPOSITE2,
178 .vmux = 3, 184 .vmux = 3,
179 .amux = LINE2, 185 .amux = LINE2,
180 .gpio = 0x4000, 186 .gpio = 0x4000,
181 },{ 187 },{
182 .name = name_svideo, 188 .type = SAA7134_INPUT_SVIDEO,
183 .vmux = 8, 189 .vmux = 8,
184 .amux = LINE2, 190 .amux = LINE2,
185 .gpio = 0x4000, 191 .gpio = 0x4000,
186 }}, 192 }},
187 .radio = { 193 .radio = {
188 .name = name_radio, 194 .type = SAA7134_INPUT_RADIO,
189 .amux = LINE2, 195 .amux = LINE2,
190 .gpio = 0x2000, 196 .gpio = 0x2000,
191 }, 197 },
192 .mute = { 198 .mute = {
193 .name = name_mute, 199 .type = SAA7134_INPUT_MUTE,
194 .amux = LINE2, 200 .amux = LINE2,
195 .gpio = 0x8000, 201 .gpio = 0x8000,
196 }, 202 },
@@ -205,20 +211,20 @@ struct saa7134_board saa7134_boards[] = {
205 .radio_addr = ADDR_UNSET, 211 .radio_addr = ADDR_UNSET,
206 212
207 .inputs = {{ 213 .inputs = {{
208 .name = name_tv, 214 .type = SAA7134_INPUT_TV,
209 .vmux = 1, 215 .vmux = 1,
210 .amux = TV, 216 .amux = TV,
211 .tv = 1, 217 .tv = 1,
212 },{ 218 },{
213 .name = name_comp1, /* Composite signal on S-Video input */ 219 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
214 .vmux = 0, 220 .vmux = 0,
215 .amux = LINE2, 221 .amux = LINE2,
216 },{ 222 },{
217 .name = name_comp2, /* Composite input */ 223 .type = SAA7134_INPUT_COMPOSITE,
218 .vmux = 3, 224 .vmux = 3,
219 .amux = LINE2, 225 .amux = LINE2,
220 },{ 226 },{
221 .name = name_svideo, 227 .type = SAA7134_INPUT_SVIDEO,
222 .vmux = 8, 228 .vmux = 8,
223 .amux = LINE2, 229 .amux = LINE2,
224 }}, 230 }},
@@ -235,40 +241,40 @@ struct saa7134_board saa7134_boards[] = {
235 241
236 .gpiomask = 0x1E000, /* Set GP16 and unused 15,14,13 to Output */ 242 .gpiomask = 0x1E000, /* Set GP16 and unused 15,14,13 to Output */
237 .inputs = {{ 243 .inputs = {{
238 .name = name_tv, 244 .type = SAA7134_INPUT_TV,
239 .vmux = 1, 245 .vmux = 1,
240 .amux = TV, 246 .amux = TV,
241 .gpio = 0x10000, /* GP16=1 selects TV input */ 247 .gpio = 0x10000, /* GP16=1 selects TV input */
242 .tv = 1, 248 .tv = 1,
243 },{ 249 },{
244/* .name = name_tv_mono, 250/* .type = SAA7134_INPUT_TV_MONO,
245 .vmux = 1, 251 .vmux = 1,
246 .amux = LINE2, 252 .amux = LINE2,
247 .gpio = 0x0000, 253 .gpio = 0x0000,
248 .tv = 1, 254 .tv = 1,
249 },{ 255 },{
250*/ .name = name_comp1, /* Composite signal on S-Video input */ 256*/ .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
251 .vmux = 0, 257 .vmux = 0,
252 .amux = LINE2, 258 .amux = LINE2,
253/* .gpio = 0x4000, */ 259/* .gpio = 0x4000, */
254 },{ 260 },{
255 .name = name_comp2, /* Composite input */ 261 .type = SAA7134_INPUT_COMPOSITE,
256 .vmux = 3, 262 .vmux = 3,
257 .amux = LINE2, 263 .amux = LINE2,
258/* .gpio = 0x4000, */ 264/* .gpio = 0x4000, */
259 },{ 265 },{
260 .name = name_svideo, /* S-Video signal on S-Video input */ 266 .type = SAA7134_INPUT_SVIDEO,
261 .vmux = 8, 267 .vmux = 8,
262 .amux = LINE2, 268 .amux = LINE2,
263/* .gpio = 0x4000, */ 269/* .gpio = 0x4000, */
264 }}, 270 }},
265 .radio = { 271 .radio = {
266 .name = name_radio, 272 .type = SAA7134_INPUT_RADIO,
267 .amux = TV, 273 .amux = TV,
268 .gpio = 0x00000, /* GP16=0 selects FM radio antenna */ 274 .gpio = 0x00000, /* GP16=0 selects FM radio antenna */
269 }, 275 },
270 .mute = { 276 .mute = {
271 .name = name_mute, 277 .type = SAA7134_INPUT_MUTE,
272 .amux = TV, 278 .amux = TV,
273 .gpio = 0x10000, 279 .gpio = 0x10000,
274 }, 280 },
@@ -285,40 +291,40 @@ struct saa7134_board saa7134_boards[] = {
285 .tda9887_conf = TDA9887_PRESENT, 291 .tda9887_conf = TDA9887_PRESENT,
286 .gpiomask = 0xe000, 292 .gpiomask = 0xe000,
287 .inputs = { { 293 .inputs = { {
288 .name = name_tv, 294 .type = SAA7134_INPUT_TV,
289 .vmux = 1, 295 .vmux = 1,
290 .amux = TV, 296 .amux = TV,
291 .gpio = 0x8000, 297 .gpio = 0x8000,
292 .tv = 1, 298 .tv = 1,
293 }, { 299 }, {
294 .name = name_tv_mono, 300 .type = SAA7134_INPUT_TV_MONO,
295 .vmux = 1, 301 .vmux = 1,
296 .amux = LINE2, 302 .amux = LINE2,
297 .gpio = 0x0000, 303 .gpio = 0x0000,
298 .tv = 1, 304 .tv = 1,
299 }, { 305 }, {
300 .name = name_comp1, 306 .type = SAA7134_INPUT_COMPOSITE1,
301 .vmux = 0, 307 .vmux = 0,
302 .amux = LINE2, 308 .amux = LINE2,
303 .gpio = 0x4000, 309 .gpio = 0x4000,
304 }, { 310 }, {
305 .name = name_comp2, 311 .type = SAA7134_INPUT_COMPOSITE2,
306 .vmux = 3, 312 .vmux = 3,
307 .amux = LINE2, 313 .amux = LINE2,
308 .gpio = 0x4000, 314 .gpio = 0x4000,
309 }, { 315 }, {
310 .name = name_svideo, 316 .type = SAA7134_INPUT_SVIDEO,
311 .vmux = 8, 317 .vmux = 8,
312 .amux = LINE2, 318 .amux = LINE2,
313 .gpio = 0x4000, 319 .gpio = 0x4000,
314 } }, 320 } },
315 .radio = { 321 .radio = {
316 .name = name_radio, 322 .type = SAA7134_INPUT_RADIO,
317 .amux = LINE2, 323 .amux = LINE2,
318 .gpio = 0x2000, 324 .gpio = 0x2000,
319 }, 325 },
320 .mute = { 326 .mute = {
321 .name = name_mute, 327 .type = SAA7134_INPUT_MUTE,
322 .amux = TV, 328 .amux = TV,
323 .gpio = 0x8000, 329 .gpio = 0x8000,
324 }, 330 },
@@ -334,21 +340,21 @@ struct saa7134_board saa7134_boards[] = {
334 .empress_addr = 0x20, 340 .empress_addr = 0x20,
335 341
336 .inputs = {{ 342 .inputs = {{
337 .name = name_comp1, 343 .type = SAA7134_INPUT_COMPOSITE1,
338 .vmux = 0, 344 .vmux = 0,
339 .amux = LINE1, 345 .amux = LINE1,
340 },{ 346 },{
341 .name = name_svideo, 347 .type = SAA7134_INPUT_SVIDEO,
342 .vmux = 8, 348 .vmux = 8,
343 .amux = LINE1, 349 .amux = LINE1,
344 },{ 350 },{
345 .name = name_tv, 351 .type = SAA7134_INPUT_TV,
346 .vmux = 1, 352 .vmux = 1,
347 .amux = LINE2, 353 .amux = LINE2,
348 .tv = 1, 354 .tv = 1,
349 }}, 355 }},
350 .radio = { 356 .radio = {
351 .name = name_radio, 357 .type = SAA7134_INPUT_RADIO,
352 .amux = LINE2, 358 .amux = LINE2,
353 }, 359 },
354 .mpeg = SAA7134_MPEG_EMPRESS, 360 .mpeg = SAA7134_MPEG_EMPRESS,
@@ -364,21 +370,21 @@ struct saa7134_board saa7134_boards[] = {
364 .radio_addr = ADDR_UNSET, 370 .radio_addr = ADDR_UNSET,
365 371
366 .inputs = {{ 372 .inputs = {{
367 .name = name_tv, 373 .type = SAA7134_INPUT_TV,
368 .vmux = 1, 374 .vmux = 1,
369 .amux = TV, 375 .amux = TV,
370 .tv = 1, 376 .tv = 1,
371 },{ 377 },{
372 .name = name_comp1, 378 .type = SAA7134_INPUT_COMPOSITE1,
373 .vmux = 0, 379 .vmux = 0,
374 .amux = LINE1, 380 .amux = LINE1,
375 },{ 381 },{
376 .name = name_svideo, 382 .type = SAA7134_INPUT_SVIDEO,
377 .vmux = 8, 383 .vmux = 8,
378 .amux = LINE1, 384 .amux = LINE1,
379 }}, 385 }},
380 .radio = { 386 .radio = {
381 .name = name_radio, 387 .type = SAA7134_INPUT_RADIO,
382 .amux = LINE2, 388 .amux = LINE2,
383 }, 389 },
384 }, 390 },
@@ -390,35 +396,35 @@ struct saa7134_board saa7134_boards[] = {
390 .tuner_addr = ADDR_UNSET, 396 .tuner_addr = ADDR_UNSET,
391 .radio_addr = ADDR_UNSET, 397 .radio_addr = ADDR_UNSET,
392 .inputs = {{ 398 .inputs = {{
393 .name = name_tv, 399 .type = SAA7134_INPUT_TV,
394 .vmux = 1, 400 .vmux = 1,
395 .amux = TV, 401 .amux = TV,
396 .tv = 1, 402 .tv = 1,
397 },{ 403 },{
398 /* workaround for problems with normal TV sound */ 404 /* workaround for problems with normal TV sound */
399 .name = name_tv_mono, 405 .type = SAA7134_INPUT_TV_MONO,
400 .vmux = 1, 406 .vmux = 1,
401 .amux = LINE2, 407 .amux = LINE2,
402 .tv = 1, 408 .tv = 1,
403 },{ 409 },{
404 .name = name_comp1, 410 .type = SAA7134_INPUT_COMPOSITE1,
405 .vmux = 0, 411 .vmux = 0,
406 .amux = LINE1, 412 .amux = LINE1,
407 },{ 413 },{
408 .name = name_comp2, 414 .type = SAA7134_INPUT_COMPOSITE2,
409 .vmux = 3, 415 .vmux = 3,
410 .amux = LINE1, 416 .amux = LINE1,
411 },{ 417 },{
412 .name = name_svideo, 418 .type = SAA7134_INPUT_SVIDEO,
413 .vmux = 8, 419 .vmux = 8,
414 .amux = LINE1, 420 .amux = LINE1,
415 }}, 421 }},
416 .radio = { 422 .radio = {
417 .name = name_radio, 423 .type = SAA7134_INPUT_RADIO,
418 .amux = LINE2, 424 .amux = LINE2,
419 }, 425 },
420 .mute = { 426 .mute = {
421 .name = name_mute, 427 .type = SAA7134_INPUT_MUTE,
422 .amux = TV, 428 .amux = TV,
423 }, 429 },
424 }, 430 },
@@ -432,32 +438,32 @@ struct saa7134_board saa7134_boards[] = {
432 .radio_addr = ADDR_UNSET, 438 .radio_addr = ADDR_UNSET,
433 .tda9887_conf = TDA9887_PRESENT, 439 .tda9887_conf = TDA9887_PRESENT,
434 .inputs = {{ 440 .inputs = {{
435 .name = name_tv, 441 .type = SAA7134_INPUT_TV,
436 .vmux = 1, 442 .vmux = 1,
437 .amux = TV, 443 .amux = TV,
438 .tv = 1, 444 .tv = 1,
439 },{ 445 },{
440 .name = name_tv_mono, 446 .type = SAA7134_INPUT_TV_MONO,
441 .vmux = 1, 447 .vmux = 1,
442 .amux = LINE2, 448 .amux = LINE2,
443 .tv = 1, 449 .tv = 1,
444 },{ 450 },{
445 451
446 .name = name_svideo, 452 .type = SAA7134_INPUT_SVIDEO,
447 .vmux = 8, 453 .vmux = 8,
448 .amux = LINE1, 454 .amux = LINE1,
449 },{ 455 },{
450 .name = name_comp1, 456 .type = SAA7134_INPUT_COMPOSITE1,
451 .vmux = 3, 457 .vmux = 3,
452 .amux = LINE1, 458 .amux = LINE1,
453 },{ 459 },{
454 460
455 .name = "CVid over SVid", 461 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
456 .vmux = 0, 462 .vmux = 0,
457 .amux = LINE1, 463 .amux = LINE1,
458 }}, 464 }},
459 .radio = { 465 .radio = {
460 .name = name_radio, 466 .type = SAA7134_INPUT_RADIO,
461 .amux = LINE2, 467 .amux = LINE2,
462 }, 468 },
463 }, 469 },
@@ -472,24 +478,24 @@ struct saa7134_board saa7134_boards[] = {
472 .tda9887_conf = TDA9887_PRESENT, 478 .tda9887_conf = TDA9887_PRESENT,
473 .gpiomask = 0x820000, 479 .gpiomask = 0x820000,
474 .inputs = {{ 480 .inputs = {{
475 .name = name_tv, 481 .type = SAA7134_INPUT_TV,
476 .vmux = 1, 482 .vmux = 1,
477 .amux = TV, 483 .amux = TV,
478 .tv = 1, 484 .tv = 1,
479 .gpio = 0x20000, 485 .gpio = 0x20000,
480 },{ 486 },{
481 .name = name_svideo, 487 .type = SAA7134_INPUT_SVIDEO,
482 .vmux = 8, 488 .vmux = 8,
483 .amux = LINE1, 489 .amux = LINE1,
484 .gpio = 0x20000, 490 .gpio = 0x20000,
485 },{ 491 },{
486 .name = name_comp1, 492 .type = SAA7134_INPUT_COMPOSITE1,
487 .vmux = 3, 493 .vmux = 3,
488 .amux = LINE1, 494 .amux = LINE1,
489 .gpio = 0x20000, 495 .gpio = 0x20000,
490 }}, 496 }},
491 .radio = { 497 .radio = {
492 .name = name_radio, 498 .type = SAA7134_INPUT_RADIO,
493 .amux = LINE2, 499 .amux = LINE2,
494 .gpio = 0x20000, 500 .gpio = 0x20000,
495 }, 501 },
@@ -504,20 +510,20 @@ struct saa7134_board saa7134_boards[] = {
504 .tuner_addr = ADDR_UNSET, 510 .tuner_addr = ADDR_UNSET,
505 .radio_addr = ADDR_UNSET, 511 .radio_addr = ADDR_UNSET,
506 .inputs = {{ 512 .inputs = {{
507 .name = name_tv, 513 .type = SAA7134_INPUT_TV,
508 .vmux = 1, 514 .vmux = 1,
509 .amux = TV, 515 .amux = TV,
510 .tv = 1, 516 .tv = 1,
511 },{ 517 },{
512 .name = name_comp1, 518 .type = SAA7134_INPUT_COMPOSITE,
513 .vmux = 4, 519 .vmux = 4,
514 .amux = LINE1, 520 .amux = LINE1,
515 },{ 521 },{
516 .name = name_svideo, 522 .type = SAA7134_INPUT_SVIDEO,
517 .vmux = 8, 523 .vmux = 8,
518 .amux = LINE1, 524 .amux = LINE1,
519 },{ 525 },{
520 .name = name_comp2, /* CVideo over SVideo Connector */ 526 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
521 .vmux = 0, 527 .vmux = 0,
522 .amux = LINE1, 528 .amux = LINE1,
523 }} 529 }}
@@ -531,31 +537,31 @@ struct saa7134_board saa7134_boards[] = {
531 .radio_addr = ADDR_UNSET, 537 .radio_addr = ADDR_UNSET,
532 .tda9887_conf = TDA9887_PRESENT, 538 .tda9887_conf = TDA9887_PRESENT,
533 .inputs = {{ 539 .inputs = {{
534 .name = name_tv, 540 .type = SAA7134_INPUT_TV,
535 .vmux = 1, 541 .vmux = 1,
536 .amux = TV, 542 .amux = TV,
537 .tv = 1, 543 .tv = 1,
538 },{ 544 },{
539 /* workaround for problems with normal TV sound */ 545 /* workaround for problems with normal TV sound */
540 .name = name_tv_mono, 546 .type = SAA7134_INPUT_TV_MONO,
541 .vmux = 1, 547 .vmux = 1,
542 .amux = LINE2, 548 .amux = LINE2,
543 .tv = 1, 549 .tv = 1,
544 },{ 550 },{
545 .name = name_comp1, 551 .type = SAA7134_INPUT_COMPOSITE1,
546 .vmux = 0, 552 .vmux = 0,
547 .amux = LINE2, 553 .amux = LINE2,
548 },{ 554 },{
549 .name = name_comp2, 555 .type = SAA7134_INPUT_COMPOSITE2,
550 .vmux = 3, 556 .vmux = 3,
551 .amux = LINE2, 557 .amux = LINE2,
552 },{ 558 },{
553 .name = name_svideo, 559 .type = SAA7134_INPUT_SVIDEO,
554 .vmux = 8, 560 .vmux = 8,
555 .amux = LINE2, 561 .amux = LINE2,
556 }}, 562 }},
557 .radio = { 563 .radio = {
558 .name = name_radio, 564 .type = SAA7134_INPUT_RADIO,
559 .amux = LINE2, 565 .amux = LINE2,
560 }, 566 },
561 }, 567 },
@@ -567,15 +573,15 @@ struct saa7134_board saa7134_boards[] = {
567 .tuner_addr = ADDR_UNSET, 573 .tuner_addr = ADDR_UNSET,
568 .radio_addr = ADDR_UNSET, 574 .radio_addr = ADDR_UNSET,
569 .inputs = {{ 575 .inputs = {{
570 .name = name_svideo, 576 .type = SAA7134_INPUT_SVIDEO,
571 .vmux = 8, 577 .vmux = 8,
572 .amux = LINE1, 578 .amux = LINE1,
573 },{ 579 },{
574 .name = name_comp1, 580 .type = SAA7134_INPUT_COMPOSITE1,
575 .vmux = 3, 581 .vmux = 3,
576 .amux = LINE1, 582 .amux = LINE1,
577 },{ 583 },{
578 .name = name_tv, 584 .type = SAA7134_INPUT_TV,
579 .vmux = 1, 585 .vmux = 1,
580 .amux = LINE2, 586 .amux = LINE2,
581 .tv = 1, 587 .tv = 1,
@@ -590,25 +596,25 @@ struct saa7134_board saa7134_boards[] = {
590 .radio_addr = ADDR_UNSET, 596 .radio_addr = ADDR_UNSET,
591 .tda9887_conf = TDA9887_PRESENT, 597 .tda9887_conf = TDA9887_PRESENT,
592 .inputs = {{ 598 .inputs = {{
593 .name = name_tv, 599 .type = SAA7134_INPUT_TV,
594 .vmux = 1, 600 .vmux = 1,
595 .amux = TV, 601 .amux = TV,
596 .tv = 1, 602 .tv = 1,
597 },{ 603 },{
598 .name = name_comp1, 604 .type = SAA7134_INPUT_COMPOSITE1,
599 .vmux = 4, 605 .vmux = 4,
600 .amux = LINE1, 606 .amux = LINE1,
601 },{ 607 },{
602 .name = name_svideo, 608 .type = SAA7134_INPUT_SVIDEO,
603 .vmux = 8, 609 .vmux = 8,
604 .amux = LINE1, 610 .amux = LINE1,
605 },{ 611 },{
606 .name = name_comp2, /* CVideo over SVideo Connector */ 612 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
607 .vmux = 0, 613 .vmux = 0,
608 .amux = LINE1, 614 .amux = LINE1,
609 }}, 615 }},
610 .radio = { 616 .radio = {
611 .name = name_radio, 617 .type = SAA7134_INPUT_RADIO,
612 .amux = LINE2, 618 .amux = LINE2,
613 }, 619 },
614 }, 620 },
@@ -622,25 +628,25 @@ struct saa7134_board saa7134_boards[] = {
622 .tda9887_conf = TDA9887_PRESENT, 628 .tda9887_conf = TDA9887_PRESENT,
623 .mpeg = SAA7134_MPEG_DVB, 629 .mpeg = SAA7134_MPEG_DVB,
624 .inputs = {{ 630 .inputs = {{
625 .name = name_tv, 631 .type = SAA7134_INPUT_TV,
626 .vmux = 1, 632 .vmux = 1,
627 .amux = TV, 633 .amux = TV,
628 .tv = 1, 634 .tv = 1,
629 },{ 635 },{
630 .name = name_comp1, 636 .type = SAA7134_INPUT_COMPOSITE1,
631 .vmux = 0, 637 .vmux = 0,
632 .amux = LINE1, 638 .amux = LINE1,
633 },{ 639 },{
634 .name = name_svideo, 640 .type = SAA7134_INPUT_SVIDEO,
635 .vmux = 8, 641 .vmux = 8,
636 .amux = LINE1, 642 .amux = LINE1,
637 }}, 643 }},
638 .radio = { 644 .radio = {
639 .name = name_radio, 645 .type = SAA7134_INPUT_RADIO,
640 .amux = LINE2, 646 .amux = LINE2,
641 }, 647 },
642 .mute = { 648 .mute = {
643 .name = name_mute, 649 .type = SAA7134_INPUT_MUTE,
644 .amux = TV, 650 .amux = TV,
645 }, 651 },
646 }, 652 },
@@ -655,21 +661,21 @@ struct saa7134_board saa7134_boards[] = {
655 .radio_addr = ADDR_UNSET, 661 .radio_addr = ADDR_UNSET,
656 .tda9887_conf = TDA9887_PRESENT, 662 .tda9887_conf = TDA9887_PRESENT,
657 .inputs = {{ 663 .inputs = {{
658 .name = name_tv, 664 .type = SAA7134_INPUT_TV,
659 .vmux = 1, 665 .vmux = 1,
660 .amux = TV, 666 .amux = TV,
661 .tv = 1, 667 .tv = 1,
662 },{ 668 },{
663 .name = name_comp1, 669 .type = SAA7134_INPUT_COMPOSITE1,
664 .vmux = 3, 670 .vmux = 3,
665 .amux = LINE1, 671 .amux = LINE1,
666 },{ 672 },{
667 .name = name_svideo, 673 .type = SAA7134_INPUT_SVIDEO,
668 .vmux = 8, 674 .vmux = 8,
669 .amux = LINE1, 675 .amux = LINE1,
670 }}, 676 }},
671 .radio = { 677 .radio = {
672 .name = name_radio, 678 .type = SAA7134_INPUT_RADIO,
673 .amux = LINE2, 679 .amux = LINE2,
674 }, 680 },
675 }, 681 },
@@ -681,15 +687,15 @@ struct saa7134_board saa7134_boards[] = {
681 .tuner_addr = ADDR_UNSET, 687 .tuner_addr = ADDR_UNSET,
682 .radio_addr = ADDR_UNSET, 688 .radio_addr = ADDR_UNSET,
683 .inputs = {{ 689 .inputs = {{
684 .name = name_svideo, 690 .type = SAA7134_INPUT_SVIDEO,
685 .vmux = 8, 691 .vmux = 8,
686 .amux = LINE1, 692 .amux = LINE1,
687 },{ 693 },{
688 .name = name_comp1, 694 .type = SAA7134_INPUT_COMPOSITE1,
689 .vmux = 0, 695 .vmux = 0,
690 .amux = LINE1, 696 .amux = LINE1,
691 },{ 697 },{
692 .name = name_tv, 698 .type = SAA7134_INPUT_TV,
693 .vmux = 4, 699 .vmux = 4,
694 .amux = LINE2, 700 .amux = LINE2,
695 .tv = 1, 701 .tv = 1,
@@ -703,16 +709,16 @@ struct saa7134_board saa7134_boards[] = {
703 .tuner_addr = ADDR_UNSET, 709 .tuner_addr = ADDR_UNSET,
704 .radio_addr = ADDR_UNSET, 710 .radio_addr = ADDR_UNSET,
705 .inputs = {{ 711 .inputs = {{
706 .name = name_svideo, 712 .type = SAA7134_INPUT_SVIDEO,
707 .vmux = 7, 713 .vmux = 7,
708 .amux = LINE1, 714 .amux = LINE1,
709 },{ 715 },{
710 .name = name_tv, 716 .type = SAA7134_INPUT_TV,
711 .vmux = 8, 717 .vmux = 8,
712 .amux = TV, 718 .amux = TV,
713 .tv = 1, 719 .tv = 1,
714 },{ 720 },{
715 .name = name_tv_mono, 721 .type = SAA7134_INPUT_TV_MONO,
716 .vmux = 8, 722 .vmux = 8,
717 .amux = LINE2, 723 .amux = LINE2,
718 .tv = 1, 724 .tv = 1,
@@ -726,21 +732,21 @@ struct saa7134_board saa7134_boards[] = {
726 .tuner_addr = ADDR_UNSET, 732 .tuner_addr = ADDR_UNSET,
727 .radio_addr = ADDR_UNSET, 733 .radio_addr = ADDR_UNSET,
728 .inputs = {{ 734 .inputs = {{
729 .name = name_tv, 735 .type = SAA7134_INPUT_TV,
730 .vmux = 4, 736 .vmux = 4,
731 .amux = LINE2, 737 .amux = LINE2,
732 .tv = 1, 738 .tv = 1,
733 },{ 739 },{
734 .name = name_comp1, 740 .type = SAA7134_INPUT_COMPOSITE1,
735 .vmux = 6, 741 .vmux = 6,
736 .amux = LINE1, 742 .amux = LINE1,
737 },{ 743 },{
738 .name = name_svideo, 744 .type = SAA7134_INPUT_SVIDEO,
739 .vmux = 7, 745 .vmux = 7,
740 .amux = LINE1, 746 .amux = LINE1,
741 }}, 747 }},
742 .mute = { 748 .mute = {
743 .name = name_mute, 749 .type = SAA7134_INPUT_MUTE,
744 .amux = TV, 750 .amux = TV,
745 }, 751 },
746 }, 752 },
@@ -753,21 +759,21 @@ struct saa7134_board saa7134_boards[] = {
753 .radio_addr = ADDR_UNSET, 759 .radio_addr = ADDR_UNSET,
754 .tda9887_conf = TDA9887_PRESENT, 760 .tda9887_conf = TDA9887_PRESENT,
755 .inputs = {{ 761 .inputs = {{
756 .name = name_tv, 762 .type = SAA7134_INPUT_TV,
757 .vmux = 1, 763 .vmux = 1,
758 .amux = TV, 764 .amux = TV,
759 .tv = 1, 765 .tv = 1,
760 },{ 766 },{
761 .name = name_comp1, 767 .type = SAA7134_INPUT_COMPOSITE1,
762 .vmux = 4, 768 .vmux = 4,
763 .amux = LINE2, 769 .amux = LINE2,
764 },{ 770 },{
765 .name = name_svideo, 771 .type = SAA7134_INPUT_SVIDEO,
766 .vmux = 6, 772 .vmux = 6,
767 .amux = LINE2, 773 .amux = LINE2,
768 }}, 774 }},
769 .radio = { 775 .radio = {
770 .name = name_radio, 776 .type = SAA7134_INPUT_RADIO,
771 .amux = LINE1, 777 .amux = LINE1,
772 }, 778 },
773 }, 779 },
@@ -780,29 +786,29 @@ struct saa7134_board saa7134_boards[] = {
780 .radio_addr = ADDR_UNSET, 786 .radio_addr = ADDR_UNSET,
781 .gpiomask = 0x200000, 787 .gpiomask = 0x200000,
782 .inputs = {{ 788 .inputs = {{
783 .name = name_tv, 789 .type = SAA7134_INPUT_TV,
784 .vmux = 1, 790 .vmux = 1,
785 .amux = TV, 791 .amux = TV,
786 .gpio = 0x0000, 792 .gpio = 0x0000,
787 .tv = 1, 793 .tv = 1,
788 },{ 794 },{
789 .name = name_comp1, 795 .type = SAA7134_INPUT_COMPOSITE1,
790 .vmux = 4, 796 .vmux = 4,
791 .amux = LINE2, 797 .amux = LINE2,
792 .gpio = 0x0000, 798 .gpio = 0x0000,
793 },{ 799 },{
794 .name = name_svideo, 800 .type = SAA7134_INPUT_SVIDEO,
795 .vmux = 6, 801 .vmux = 6,
796 .amux = LINE2, 802 .amux = LINE2,
797 .gpio = 0x0000, 803 .gpio = 0x0000,
798 }}, 804 }},
799 .radio = { 805 .radio = {
800 .name = name_radio, 806 .type = SAA7134_INPUT_RADIO,
801 .amux = TV, 807 .amux = TV,
802 .gpio = 0x200000, 808 .gpio = 0x200000,
803 }, 809 },
804 .mute = { 810 .mute = {
805 .name = name_mute, 811 .type = SAA7134_INPUT_MUTE,
806 .gpio = 0x0000, 812 .gpio = 0x0000,
807 }, 813 },
808 814
@@ -815,15 +821,15 @@ struct saa7134_board saa7134_boards[] = {
815 .tuner_addr = ADDR_UNSET, 821 .tuner_addr = ADDR_UNSET,
816 .radio_addr = ADDR_UNSET, 822 .radio_addr = ADDR_UNSET,
817 .inputs = {{ 823 .inputs = {{
818 .name = name_svideo, 824 .type = SAA7134_INPUT_SVIDEO,
819 .vmux = 8, 825 .vmux = 8,
820 .amux = LINE1, 826 .amux = LINE1,
821 },{ 827 },{
822 .name = name_comp1, 828 .type = SAA7134_INPUT_COMPOSITE1,
823 .vmux = 3, 829 .vmux = 3,
824 .amux = LINE1, 830 .amux = LINE1,
825 },{ 831 },{
826 .name = name_tv, 832 .type = SAA7134_INPUT_TV,
827 .vmux = 1, 833 .vmux = 1,
828 .amux = LINE2, 834 .amux = LINE2,
829 .tv = 1, 835 .tv = 1,
@@ -839,34 +845,34 @@ struct saa7134_board saa7134_boards[] = {
839 .radio_addr = ADDR_UNSET, 845 .radio_addr = ADDR_UNSET,
840 .gpiomask = 0xe000, 846 .gpiomask = 0xe000,
841 .inputs = {{ 847 .inputs = {{
842 .name = name_tv, 848 .type = SAA7134_INPUT_TV,
843 .vmux = 1, 849 .vmux = 1,
844 .amux = LINE2, 850 .amux = LINE2,
845 .gpio = 0x0000, 851 .gpio = 0x0000,
846 .tv = 1, 852 .tv = 1,
847 },{ 853 },{
848 .name = name_comp1, 854 .type = SAA7134_INPUT_COMPOSITE1,
849 .vmux = 0, 855 .vmux = 0,
850 .amux = LINE2, 856 .amux = LINE2,
851 .gpio = 0x4000, 857 .gpio = 0x4000,
852 },{ 858 },{
853 .name = name_comp2, 859 .type = SAA7134_INPUT_COMPOSITE2,
854 .vmux = 3, 860 .vmux = 3,
855 .amux = LINE2, 861 .amux = LINE2,
856 .gpio = 0x4000, 862 .gpio = 0x4000,
857 },{ 863 },{
858 .name = name_svideo, 864 .type = SAA7134_INPUT_SVIDEO,
859 .vmux = 8, 865 .vmux = 8,
860 .amux = LINE2, 866 .amux = LINE2,
861 .gpio = 0x4000, 867 .gpio = 0x4000,
862 }}, 868 }},
863 .radio = { 869 .radio = {
864 .name = name_radio, 870 .type = SAA7134_INPUT_RADIO,
865 .amux = LINE2, 871 .amux = LINE2,
866 .gpio = 0x2000, 872 .gpio = 0x2000,
867 }, 873 },
868 .mute = { 874 .mute = {
869 .name = name_mute, 875 .type = SAA7134_INPUT_MUTE,
870 .amux = LINE2, 876 .amux = LINE2,
871 .gpio = 0x8000, 877 .gpio = 0x8000,
872 }, 878 },
@@ -881,23 +887,23 @@ struct saa7134_board saa7134_boards[] = {
881 .radio_addr = ADDR_UNSET, 887 .radio_addr = ADDR_UNSET,
882 .empress_addr = 0x20, 888 .empress_addr = 0x20,
883 .inputs = {{ 889 .inputs = {{
884 .name = name_comp1, 890 .type = SAA7134_INPUT_COMPOSITE1,
885 .vmux = 4, 891 .vmux = 4,
886 .amux = LINE1, 892 .amux = LINE1,
887 },{ 893 },{
888 .name = name_comp2, 894 .type = SAA7134_INPUT_COMPOSITE2,
889 .vmux = 3, 895 .vmux = 3,
890 .amux = LINE1, 896 .amux = LINE1,
891 },{ 897 },{
892 .name = name_comp3, 898 .type = SAA7134_INPUT_COMPOSITE3,
893 .vmux = 0, 899 .vmux = 0,
894 .amux = LINE1, 900 .amux = LINE1,
895 },{ 901 },{
896 .name = name_comp4, 902 .type = SAA7134_INPUT_COMPOSITE4,
897 .vmux = 1, 903 .vmux = 1,
898 .amux = LINE1, 904 .amux = LINE1,
899 },{ 905 },{
900 .name = name_svideo, 906 .type = SAA7134_INPUT_SVIDEO,
901 .vmux = 8, 907 .vmux = 8,
902 .amux = LINE1, 908 .amux = LINE1,
903 }}, 909 }},
@@ -912,15 +918,15 @@ struct saa7134_board saa7134_boards[] = {
912 .tuner_addr = ADDR_UNSET, 918 .tuner_addr = ADDR_UNSET,
913 .radio_addr = ADDR_UNSET, 919 .radio_addr = ADDR_UNSET,
914 .inputs = {{ 920 .inputs = {{
915 .name = name_svideo, 921 .type = SAA7134_INPUT_SVIDEO,
916 .vmux = 8, 922 .vmux = 8,
917 .amux = LINE1, 923 .amux = LINE1,
918 },{ 924 },{
919 .name = name_comp1, 925 .type = SAA7134_INPUT_COMPOSITE1,
920 .vmux = 3, 926 .vmux = 3,
921 .amux = LINE1, 927 .amux = LINE1,
922 },{ 928 },{
923 .name = name_tv, 929 .type = SAA7134_INPUT_TV,
924 .vmux = 1, 930 .vmux = 1,
925 .amux = LINE2, 931 .amux = LINE2,
926 .tv = 1, 932 .tv = 1,
@@ -935,17 +941,17 @@ struct saa7134_board saa7134_boards[] = {
935 .tuner_addr = ADDR_UNSET, 941 .tuner_addr = ADDR_UNSET,
936 .radio_addr = ADDR_UNSET, 942 .radio_addr = ADDR_UNSET,
937 .inputs = {{ 943 .inputs = {{
938 .name = name_svideo, 944 .type = SAA7134_INPUT_SVIDEO,
939 .vmux = 8, 945 .vmux = 8,
940 .amux = LINE1, 946 .amux = LINE1,
941 .gpio = 0x06c00012, 947 .gpio = 0x06c00012,
942 },{ 948 },{
943 .name = name_comp1, 949 .type = SAA7134_INPUT_COMPOSITE1,
944 .vmux = 3, 950 .vmux = 3,
945 .amux = LINE1, 951 .amux = LINE1,
946 .gpio = 0x0ac20012, 952 .gpio = 0x0ac20012,
947 },{ 953 },{
948 .name = name_tv, 954 .type = SAA7134_INPUT_TV,
949 .vmux = 1, 955 .vmux = 1,
950 .amux = LINE2, 956 .amux = LINE2,
951 .gpio = 0x08c20012, 957 .gpio = 0x08c20012,
@@ -968,23 +974,23 @@ struct saa7134_board saa7134_boards[] = {
968 .radio_addr = ADDR_UNSET, 974 .radio_addr = ADDR_UNSET,
969 .gpiomask = 0xcf00, 975 .gpiomask = 0xcf00,
970 .inputs = {{ 976 .inputs = {{
971 .name = name_comp1, 977 .type = SAA7134_INPUT_COMPOSITE1,
972 .vmux = 0, 978 .vmux = 0,
973 .gpio = 2 << 14, 979 .gpio = 2 << 14,
974 },{ 980 },{
975 .name = name_comp2, 981 .type = SAA7134_INPUT_COMPOSITE2,
976 .vmux = 0, 982 .vmux = 0,
977 .gpio = 1 << 14, 983 .gpio = 1 << 14,
978 },{ 984 },{
979 .name = name_comp3, 985 .type = SAA7134_INPUT_COMPOSITE3,
980 .vmux = 0, 986 .vmux = 0,
981 .gpio = 0 << 14, 987 .gpio = 0 << 14,
982 },{ 988 },{
983 .name = name_comp4, 989 .type = SAA7134_INPUT_COMPOSITE4,
984 .vmux = 0, 990 .vmux = 0,
985 .gpio = 3 << 14, 991 .gpio = 3 << 14,
986 },{ 992 },{
987 .name = name_svideo, 993 .type = SAA7134_INPUT_SVIDEO,
988 .vmux = 8, 994 .vmux = 8,
989 .gpio = 2 << 14, 995 .gpio = 2 << 14,
990 }}, 996 }},
@@ -999,34 +1005,34 @@ struct saa7134_board saa7134_boards[] = {
999 .tda9887_conf = TDA9887_PRESENT, 1005 .tda9887_conf = TDA9887_PRESENT,
1000 .gpiomask = 0x03, 1006 .gpiomask = 0x03,
1001 .inputs = {{ 1007 .inputs = {{
1002 .name = name_tv, 1008 .type = SAA7134_INPUT_TV,
1003 .vmux = 1, 1009 .vmux = 1,
1004 .amux = TV, 1010 .amux = TV,
1005 .tv = 1, 1011 .tv = 1,
1006 .gpio = 0x00, 1012 .gpio = 0x00,
1007 }, { 1013 }, {
1008 .name = name_comp1, 1014 .type = SAA7134_INPUT_COMPOSITE1,
1009 .vmux = 3, 1015 .vmux = 3,
1010 .amux = LINE1, 1016 .amux = LINE1,
1011 .gpio = 0x02, 1017 .gpio = 0x02,
1012 }, { 1018 }, {
1013 .name = name_comp2, 1019 .type = SAA7134_INPUT_COMPOSITE2,
1014 .vmux = 0, 1020 .vmux = 0,
1015 .amux = LINE1, 1021 .amux = LINE1,
1016 .gpio = 0x02, 1022 .gpio = 0x02,
1017 }, { 1023 }, {
1018 .name = name_svideo, 1024 .type = SAA7134_INPUT_SVIDEO,
1019 .vmux = 8, 1025 .vmux = 8,
1020 .amux = LINE1, 1026 .amux = LINE1,
1021 .gpio = 0x02, 1027 .gpio = 0x02,
1022 } }, 1028 } },
1023 .radio = { 1029 .radio = {
1024 .name = name_radio, 1030 .type = SAA7134_INPUT_RADIO,
1025 .amux = LINE1, 1031 .amux = LINE1,
1026 .gpio = 0x01, 1032 .gpio = 0x01,
1027 }, 1033 },
1028 .mute = { 1034 .mute = {
1029 .name = name_mute, 1035 .type = SAA7134_INPUT_MUTE,
1030 .amux = TV, 1036 .amux = TV,
1031 .gpio = 0x00, 1037 .gpio = 0x00,
1032 }, 1038 },
@@ -1041,15 +1047,15 @@ struct saa7134_board saa7134_boards[] = {
1041 .radio_addr = ADDR_UNSET, 1047 .radio_addr = ADDR_UNSET,
1042 .empress_addr = 0x20, 1048 .empress_addr = 0x20,
1043 .inputs = {{ 1049 .inputs = {{
1044 .name = name_comp1, 1050 .type = SAA7134_INPUT_COMPOSITE1,
1045 .vmux = 1, 1051 .vmux = 1,
1046 .amux = LINE1, 1052 .amux = LINE1,
1047 },{ 1053 },{
1048 .name = name_svideo, 1054 .type = SAA7134_INPUT_SVIDEO,
1049 .vmux = 8, 1055 .vmux = 8,
1050 .amux = LINE1, 1056 .amux = LINE1,
1051 },{ 1057 },{
1052 .name = name_tv, 1058 .type = SAA7134_INPUT_TV,
1053 .vmux = 3, 1059 .vmux = 3,
1054 .amux = TV, 1060 .amux = TV,
1055 .tv = 1, 1061 .tv = 1,
@@ -1068,22 +1074,22 @@ struct saa7134_board saa7134_boards[] = {
1068 .radio_addr = ADDR_UNSET, 1074 .radio_addr = ADDR_UNSET,
1069 .tda9887_conf = TDA9887_PRESENT, 1075 .tda9887_conf = TDA9887_PRESENT,
1070 .inputs = {{ 1076 .inputs = {{
1071 .name = name_tv, 1077 .type = SAA7134_INPUT_TV,
1072 .vmux = 1, 1078 .vmux = 1,
1073 .amux = TV, 1079 .amux = TV,
1074 .tv = 1, 1080 .tv = 1,
1075 1081
1076 },{ 1082 },{
1077 .name = name_comp1, 1083 .type = SAA7134_INPUT_COMPOSITE1,
1078 .vmux = 4, 1084 .vmux = 4,
1079 .amux = LINE2, 1085 .amux = LINE2,
1080 },{ 1086 },{
1081 .name = name_svideo, 1087 .type = SAA7134_INPUT_SVIDEO,
1082 .vmux = 6, 1088 .vmux = 6,
1083 .amux = LINE2, 1089 .amux = LINE2,
1084 }}, 1090 }},
1085 .radio = { 1091 .radio = {
1086 .name = name_radio, 1092 .type = SAA7134_INPUT_RADIO,
1087 .amux = LINE1, 1093 .amux = LINE1,
1088 }, 1094 },
1089 }, 1095 },
@@ -1096,20 +1102,20 @@ struct saa7134_board saa7134_boards[] = {
1096 .radio_addr = ADDR_UNSET, 1102 .radio_addr = ADDR_UNSET,
1097 .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE, 1103 .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE,
1098 .inputs = {{ 1104 .inputs = {{
1099 .name = name_tv, 1105 .type = SAA7134_INPUT_TV,
1100 .vmux = 3, 1106 .vmux = 3,
1101 .amux = TV, 1107 .amux = TV,
1102 .tv = 1, 1108 .tv = 1,
1103 },{ 1109 },{
1104 .name = name_comp1, 1110 .type = SAA7134_INPUT_COMPOSITE1,
1105 .vmux = 0, 1111 .vmux = 0,
1106 .amux = LINE2, 1112 .amux = LINE2,
1107 },{ 1113 },{
1108 .name = name_comp2, 1114 .type = SAA7134_INPUT_COMPOSITE2,
1109 .vmux = 1, 1115 .vmux = 1,
1110 .amux = LINE2, 1116 .amux = LINE2,
1111 },{ 1117 },{
1112 .name = name_svideo, 1118 .type = SAA7134_INPUT_SVIDEO,
1113 .vmux = 8, 1119 .vmux = 8,
1114 .amux = LINE2, 1120 .amux = LINE2,
1115 }}, 1121 }},
@@ -1123,21 +1129,21 @@ struct saa7134_board saa7134_boards[] = {
1123 .tuner_addr = ADDR_UNSET, 1129 .tuner_addr = ADDR_UNSET,
1124 .radio_addr = ADDR_UNSET, 1130 .radio_addr = ADDR_UNSET,
1125 .inputs = {{ 1131 .inputs = {{
1126 .name = name_svideo, 1132 .type = SAA7134_INPUT_SVIDEO,
1127 .vmux = 8, 1133 .vmux = 8,
1128 .amux = LINE1, 1134 .amux = LINE1,
1129 },{ 1135 },{
1130 .name = name_comp1, 1136 .type = SAA7134_INPUT_COMPOSITE1,
1131 .vmux = 1, 1137 .vmux = 1,
1132 .amux = LINE1, 1138 .amux = LINE1,
1133 },{ 1139 },{
1134 .name = name_tv, 1140 .type = SAA7134_INPUT_TV,
1135 .vmux = 3, 1141 .vmux = 3,
1136 .amux = LINE2, 1142 .amux = LINE2,
1137 .tv = 1, 1143 .tv = 1,
1138 }}, 1144 }},
1139 .radio = { 1145 .radio = {
1140 .name = name_radio, 1146 .type = SAA7134_INPUT_RADIO,
1141 .amux = LINE2, 1147 .amux = LINE2,
1142 }, 1148 },
1143 }, 1149 },
@@ -1150,21 +1156,21 @@ struct saa7134_board saa7134_boards[] = {
1150 .tuner_addr = ADDR_UNSET, 1156 .tuner_addr = ADDR_UNSET,
1151 .radio_addr = ADDR_UNSET, 1157 .radio_addr = ADDR_UNSET,
1152 .inputs = {{ 1158 .inputs = {{
1153 .name = name_svideo, 1159 .type = SAA7134_INPUT_SVIDEO,
1154 .vmux = 8, 1160 .vmux = 8,
1155 .amux = LINE1, 1161 .amux = LINE1,
1156 },{ 1162 },{
1157 .name = name_comp1, 1163 .type = SAA7134_INPUT_COMPOSITE1,
1158 .vmux = 1, 1164 .vmux = 1,
1159 .amux = LINE1, 1165 .amux = LINE1,
1160 },{ 1166 },{
1161 .name = name_tv, 1167 .type = SAA7134_INPUT_TV,
1162 .vmux = 3, 1168 .vmux = 3,
1163 .amux = LINE2, 1169 .amux = LINE2,
1164 .tv = 1, 1170 .tv = 1,
1165 }}, 1171 }},
1166 .mute = { 1172 .mute = {
1167 .name = name_mute, 1173 .type = SAA7134_INPUT_MUTE,
1168 .amux = LINE1, 1174 .amux = LINE1,
1169 }, 1175 },
1170 }, 1176 },
@@ -1177,16 +1183,16 @@ struct saa7134_board saa7134_boards[] = {
1177 .tuner_addr = ADDR_UNSET, 1183 .tuner_addr = ADDR_UNSET,
1178 .radio_addr = ADDR_UNSET, 1184 .radio_addr = ADDR_UNSET,
1179 .inputs = {{ 1185 .inputs = {{
1180 .name = name_tv, 1186 .type = SAA7134_INPUT_TV,
1181 .vmux = 1, 1187 .vmux = 1,
1182 .amux = LINE2, 1188 .amux = LINE2,
1183 .tv = 1, 1189 .tv = 1,
1184 },{ 1190 },{
1185 .name = name_comp1, 1191 .type = SAA7134_INPUT_COMPOSITE1,
1186 .vmux = 3, 1192 .vmux = 3,
1187 .amux = LINE2, 1193 .amux = LINE2,
1188 },{ 1194 },{
1189 .name = name_svideo, 1195 .type = SAA7134_INPUT_SVIDEO,
1190 .vmux = 8, 1196 .vmux = 8,
1191 .amux = LINE2, 1197 .amux = LINE2,
1192 }}, 1198 }},
@@ -1199,30 +1205,30 @@ struct saa7134_board saa7134_boards[] = {
1199 .tuner_addr = ADDR_UNSET, 1205 .tuner_addr = ADDR_UNSET,
1200 .radio_addr = ADDR_UNSET, 1206 .radio_addr = ADDR_UNSET,
1201 .inputs = {{ 1207 .inputs = {{
1202 .name = name_tv, 1208 .type = SAA7134_INPUT_TV,
1203 .vmux = 1, 1209 .vmux = 1,
1204 .amux = TV, 1210 .amux = TV,
1205 .tv = 1, 1211 .tv = 1,
1206 },{ 1212 },{
1207 .name = name_tv_mono, 1213 .type = SAA7134_INPUT_TV_MONO,
1208 .vmux = 1, 1214 .vmux = 1,
1209 .amux = LINE2, 1215 .amux = LINE2,
1210 .tv = 1, 1216 .tv = 1,
1211 },{ 1217 },{
1212 .name = name_comp1, 1218 .type = SAA7134_INPUT_COMPOSITE1,
1213 .vmux = 3, 1219 .vmux = 3,
1214 .amux = LINE1, 1220 .amux = LINE1,
1215 },{ 1221 },{
1216 .name = name_svideo, 1222 .type = SAA7134_INPUT_SVIDEO,
1217 .vmux = 8, 1223 .vmux = 8,
1218 .amux = LINE1, 1224 .amux = LINE1,
1219 },{ 1225 },{
1220 .name = "CVid over SVid", 1226 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
1221 .vmux = 0, 1227 .vmux = 0,
1222 .amux = LINE1, 1228 .amux = LINE1,
1223 }}, 1229 }},
1224 .radio = { 1230 .radio = {
1225 .name = name_radio, 1231 .type = SAA7134_INPUT_RADIO,
1226 .amux = LINE2, 1232 .amux = LINE2,
1227 }, 1233 },
1228 }, 1234 },
@@ -1234,30 +1240,30 @@ struct saa7134_board saa7134_boards[] = {
1234 .tuner_addr = ADDR_UNSET, 1240 .tuner_addr = ADDR_UNSET,
1235 .radio_addr = ADDR_UNSET, 1241 .radio_addr = ADDR_UNSET,
1236 .inputs = {{ 1242 .inputs = {{
1237 .name = name_tv, 1243 .type = SAA7134_INPUT_TV,
1238 .vmux = 1, 1244 .vmux = 1,
1239 .amux = TV, 1245 .amux = TV,
1240 .tv = 1, 1246 .tv = 1,
1241 },{ 1247 },{
1242 .name = name_tv_mono, 1248 .type = SAA7134_INPUT_TV_MONO,
1243 .vmux = 1, 1249 .vmux = 1,
1244 .amux = LINE2, 1250 .amux = LINE2,
1245 .tv = 1, 1251 .tv = 1,
1246 },{ 1252 },{
1247 .name = name_comp1, 1253 .type = SAA7134_INPUT_COMPOSITE1,
1248 .vmux = 3, 1254 .vmux = 3,
1249 .amux = LINE1, 1255 .amux = LINE1,
1250 },{ 1256 },{
1251 .name = name_svideo, 1257 .type = SAA7134_INPUT_SVIDEO,
1252 .vmux = 8, 1258 .vmux = 8,
1253 .amux = LINE1, 1259 .amux = LINE1,
1254 },{ 1260 },{
1255 .name = "CVid over SVid", 1261 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
1256 .vmux = 0, 1262 .vmux = 0,
1257 .amux = LINE1, 1263 .amux = LINE1,
1258 }}, 1264 }},
1259 .radio = { 1265 .radio = {
1260 .name = name_radio, 1266 .type = SAA7134_INPUT_RADIO,
1261 .amux = LINE2, 1267 .amux = LINE2,
1262 }, 1268 },
1263 }, 1269 },
@@ -1270,30 +1276,30 @@ struct saa7134_board saa7134_boards[] = {
1270 .tuner_addr = ADDR_UNSET, 1276 .tuner_addr = ADDR_UNSET,
1271 .radio_addr = ADDR_UNSET, 1277 .radio_addr = ADDR_UNSET,
1272 .inputs = {{ 1278 .inputs = {{
1273 .name = name_tv, 1279 .type = SAA7134_INPUT_TV,
1274 .vmux = 1, 1280 .vmux = 1,
1275 .amux = TV, 1281 .amux = TV,
1276 .tv = 1, 1282 .tv = 1,
1277 },{ 1283 },{
1278 .name = name_tv_mono, 1284 .type = SAA7134_INPUT_TV_MONO,
1279 .vmux = 1, 1285 .vmux = 1,
1280 .amux = LINE2, 1286 .amux = LINE2,
1281 .tv = 1, 1287 .tv = 1,
1282 },{ 1288 },{
1283 .name = name_comp1, 1289 .type = SAA7134_INPUT_COMPOSITE1,
1284 .vmux = 3, 1290 .vmux = 3,
1285 .amux = LINE1, 1291 .amux = LINE1,
1286 },{ 1292 },{
1287 .name = name_svideo, 1293 .type = SAA7134_INPUT_SVIDEO,
1288 .vmux = 8, 1294 .vmux = 8,
1289 .amux = LINE1, 1295 .amux = LINE1,
1290 },{ 1296 },{
1291 .name = "CVid over SVid", 1297 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
1292 .vmux = 0, 1298 .vmux = 0,
1293 .amux = LINE1, 1299 .amux = LINE1,
1294 }}, 1300 }},
1295 .radio = { 1301 .radio = {
1296 .name = name_radio, 1302 .type = SAA7134_INPUT_RADIO,
1297 .amux = LINE2, 1303 .amux = LINE2,
1298 }, 1304 },
1299 }, 1305 },
@@ -1306,30 +1312,30 @@ struct saa7134_board saa7134_boards[] = {
1306 .tuner_addr = ADDR_UNSET, 1312 .tuner_addr = ADDR_UNSET,
1307 .radio_addr = ADDR_UNSET, 1313 .radio_addr = ADDR_UNSET,
1308 .inputs = {{ 1314 .inputs = {{
1309 .name = name_tv, 1315 .type = SAA7134_INPUT_TV,
1310 .vmux = 1, 1316 .vmux = 1,
1311 .amux = TV, 1317 .amux = TV,
1312 .tv = 1, 1318 .tv = 1,
1313 },{ 1319 },{
1314 .name = name_tv_mono, 1320 .type = SAA7134_INPUT_TV_MONO,
1315 .vmux = 1, 1321 .vmux = 1,
1316 .amux = LINE2, 1322 .amux = LINE2,
1317 .tv = 1, 1323 .tv = 1,
1318 },{ 1324 },{
1319 .name = name_comp1, 1325 .type = SAA7134_INPUT_COMPOSITE1,
1320 .vmux = 0, 1326 .vmux = 0,
1321 .amux = LINE2, 1327 .amux = LINE2,
1322 },{ 1328 },{
1323 .name = name_comp2, 1329 .type = SAA7134_INPUT_COMPOSITE2,
1324 .vmux = 3, 1330 .vmux = 3,
1325 .amux = LINE2, 1331 .amux = LINE2,
1326 },{ 1332 },{
1327 .name = name_svideo, 1333 .type = SAA7134_INPUT_SVIDEO,
1328 .vmux = 8, 1334 .vmux = 8,
1329 .amux = LINE2, 1335 .amux = LINE2,
1330 }}, 1336 }},
1331 .radio = { 1337 .radio = {
1332 .name = name_radio, 1338 .type = SAA7134_INPUT_RADIO,
1333 .amux = LINE2, 1339 .amux = LINE2,
1334 .gpio = 0x200000, 1340 .gpio = 0x200000,
1335 }, 1341 },
@@ -1343,10 +1349,10 @@ struct saa7134_board saa7134_boards[] = {
1343 .tuner_addr = ADDR_UNSET, 1349 .tuner_addr = ADDR_UNSET,
1344 .radio_addr = ADDR_UNSET, 1350 .radio_addr = ADDR_UNSET,
1345 .inputs = {{ 1351 .inputs = {{
1346 .name = name_comp1, 1352 .type = SAA7134_INPUT_COMPOSITE1,
1347 .vmux = 3, 1353 .vmux = 3,
1348 },{ 1354 },{
1349 .name = name_svideo, 1355 .type = SAA7134_INPUT_SVIDEO,
1350 .vmux = 8, 1356 .vmux = 8,
1351 }}, 1357 }},
1352 }, 1358 },
@@ -1360,7 +1366,7 @@ struct saa7134_board saa7134_boards[] = {
1360 .radio_addr = ADDR_UNSET, 1366 .radio_addr = ADDR_UNSET,
1361 .mpeg = SAA7134_MPEG_DVB, 1367 .mpeg = SAA7134_MPEG_DVB,
1362 .inputs = {{ 1368 .inputs = {{
1363 .name = name_tv, 1369 .type = SAA7134_INPUT_TV,
1364 .vmux = 1, 1370 .vmux = 1,
1365 .amux = TV, 1371 .amux = TV,
1366 .tv = 1, 1372 .tv = 1,
@@ -1375,15 +1381,15 @@ struct saa7134_board saa7134_boards[] = {
1375 .tuner_addr = ADDR_UNSET, 1381 .tuner_addr = ADDR_UNSET,
1376 .radio_addr = ADDR_UNSET, 1382 .radio_addr = ADDR_UNSET,
1377 .inputs = {{ 1383 .inputs = {{
1378 .name = name_comp1, 1384 .type = SAA7134_INPUT_COMPOSITE1,
1379 .vmux = 3, 1385 .vmux = 3,
1380 },{ 1386 },{
1381 .name = name_tv, 1387 .type = SAA7134_INPUT_TV,
1382 .vmux = 1, 1388 .vmux = 1,
1383 .amux = TV, 1389 .amux = TV,
1384 .tv = 1, 1390 .tv = 1,
1385 },{ 1391 },{
1386 .name = name_svideo, 1392 .type = SAA7134_INPUT_SVIDEO,
1387 .vmux = 8, 1393 .vmux = 8,
1388 }}, 1394 }},
1389 }, 1395 },
@@ -1396,29 +1402,29 @@ struct saa7134_board saa7134_boards[] = {
1396 .radio_addr = ADDR_UNSET, 1402 .radio_addr = ADDR_UNSET,
1397 .tda9887_conf = TDA9887_PRESENT, 1403 .tda9887_conf = TDA9887_PRESENT,
1398 .inputs = {{ 1404 .inputs = {{
1399 .name = name_tv, 1405 .type = SAA7134_INPUT_TV,
1400 .vmux = 1, 1406 .vmux = 1,
1401 .amux = LINE2, 1407 .amux = LINE2,
1402 .tv = 1, 1408 .tv = 1,
1403 },{ 1409 },{
1404 .name = name_comp1, 1410 .type = SAA7134_INPUT_COMPOSITE1,
1405 .vmux = 0, 1411 .vmux = 0,
1406 .amux = LINE2, 1412 .amux = LINE2,
1407 },{ 1413 },{
1408 .name = name_comp2, 1414 .type = SAA7134_INPUT_COMPOSITE2,
1409 .vmux = 3, 1415 .vmux = 3,
1410 .amux = LINE2, 1416 .amux = LINE2,
1411 },{ 1417 },{
1412 .name = name_svideo, 1418 .type = SAA7134_INPUT_SVIDEO,
1413 .vmux = 8, 1419 .vmux = 8,
1414 .amux = LINE2, 1420 .amux = LINE2,
1415 }}, 1421 }},
1416 .radio = { 1422 .radio = {
1417 .name = name_radio, 1423 .type = SAA7134_INPUT_RADIO,
1418 .amux = LINE2, 1424 .amux = LINE2,
1419 }, 1425 },
1420 .mute = { 1426 .mute = {
1421 .name = name_mute, 1427 .type = SAA7134_INPUT_MUTE,
1422 .amux = LINE1, 1428 .amux = LINE1,
1423 }, 1429 },
1424 }, 1430 },
@@ -1432,29 +1438,29 @@ struct saa7134_board saa7134_boards[] = {
1432 .radio_addr = ADDR_UNSET, 1438 .radio_addr = ADDR_UNSET,
1433 .tda9887_conf = TDA9887_PRESENT, 1439 .tda9887_conf = TDA9887_PRESENT,
1434 .inputs = { { 1440 .inputs = { {
1435 .name = name_tv, 1441 .type = SAA7134_INPUT_TV,
1436 .vmux = 1, 1442 .vmux = 1,
1437 .amux = LINE2, 1443 .amux = LINE2,
1438 .tv = 1, 1444 .tv = 1,
1439 }, { 1445 }, {
1440 .name = name_comp1, 1446 .type = SAA7134_INPUT_COMPOSITE1,
1441 .vmux = 0, 1447 .vmux = 0,
1442 .amux = LINE2, 1448 .amux = LINE2,
1443 }, { 1449 }, {
1444 .name = name_comp2, 1450 .type = SAA7134_INPUT_COMPOSITE2,
1445 .vmux = 3, 1451 .vmux = 3,
1446 .amux = LINE2, 1452 .amux = LINE2,
1447 },{ 1453 },{
1448 .name = name_svideo, 1454 .type = SAA7134_INPUT_SVIDEO,
1449 .vmux = 8, 1455 .vmux = 8,
1450 .amux = LINE2, 1456 .amux = LINE2,
1451 } }, 1457 } },
1452 .radio = { 1458 .radio = {
1453 .name = name_radio, 1459 .type = SAA7134_INPUT_RADIO,
1454 .amux = LINE2, 1460 .amux = LINE2,
1455 }, 1461 },
1456 .mute = { 1462 .mute = {
1457 .name = name_mute, 1463 .type = SAA7134_INPUT_MUTE,
1458 .amux = LINE1, 1464 .amux = LINE1,
1459 }, 1465 },
1460 }, 1466 },
@@ -1467,12 +1473,12 @@ struct saa7134_board saa7134_boards[] = {
1467 .radio_addr = ADDR_UNSET, 1473 .radio_addr = ADDR_UNSET,
1468 .tda9887_conf = TDA9887_PRESENT, 1474 .tda9887_conf = TDA9887_PRESENT,
1469 .inputs = {{ 1475 .inputs = {{
1470 .name = name_tv, 1476 .type = SAA7134_INPUT_TV,
1471 .vmux = 7, 1477 .vmux = 7,
1472 .amux = TV, 1478 .amux = TV,
1473 .tv = 1, 1479 .tv = 1,
1474 },{ 1480 },{
1475 .name = name_svideo, 1481 .type = SAA7134_INPUT_SVIDEO,
1476 .vmux = 7, 1482 .vmux = 7,
1477 .amux = LINE1, 1483 .amux = LINE1,
1478 }}, 1484 }},
@@ -1486,21 +1492,21 @@ struct saa7134_board saa7134_boards[] = {
1486 .tuner_addr = ADDR_UNSET, 1492 .tuner_addr = ADDR_UNSET,
1487 .radio_addr = ADDR_UNSET, 1493 .radio_addr = ADDR_UNSET,
1488 .inputs = {{ 1494 .inputs = {{
1489 .name = name_tv, 1495 .type = SAA7134_INPUT_TV,
1490 .vmux = 3, 1496 .vmux = 3,
1491 .amux = TV, 1497 .amux = TV,
1492 .tv = 1, 1498 .tv = 1,
1493 },{ 1499 },{
1494 .name = name_comp1, 1500 .type = SAA7134_INPUT_COMPOSITE1,
1495 .vmux = 1, 1501 .vmux = 1,
1496 .amux = LINE1, 1502 .amux = LINE1,
1497 },{ 1503 },{
1498 .name = name_svideo, 1504 .type = SAA7134_INPUT_SVIDEO,
1499 .vmux = 8, 1505 .vmux = 8,
1500 .amux = LINE1, 1506 .amux = LINE1,
1501 }}, 1507 }},
1502 .radio = { 1508 .radio = {
1503 .name = name_radio, 1509 .type = SAA7134_INPUT_RADIO,
1504 .amux = LINE2, 1510 .amux = LINE2,
1505 }, 1511 },
1506 }, 1512 },
@@ -1512,25 +1518,25 @@ struct saa7134_board saa7134_boards[] = {
1512 .tuner_addr = ADDR_UNSET, 1518 .tuner_addr = ADDR_UNSET,
1513 .radio_addr = ADDR_UNSET, 1519 .radio_addr = ADDR_UNSET,
1514 .inputs = {{ 1520 .inputs = {{
1515 .name = name_tv, 1521 .type = SAA7134_INPUT_TV,
1516 .vmux = 1, 1522 .vmux = 1,
1517 .amux = LINE2, 1523 .amux = LINE2,
1518 .tv = 1, 1524 .tv = 1,
1519 },{ 1525 },{
1520 .name = name_comp1, 1526 .type = SAA7134_INPUT_COMPOSITE1,
1521 .vmux = 4, 1527 .vmux = 4,
1522 .amux = LINE1, 1528 .amux = LINE1,
1523 },{ 1529 },{
1524 .name = name_svideo, 1530 .type = SAA7134_INPUT_SVIDEO,
1525 .vmux = 8, 1531 .vmux = 8,
1526 .amux = LINE1, 1532 .amux = LINE1,
1527 },{ 1533 },{
1528 .name = name_comp2, /* CVideo over SVideo Connector */ 1534 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
1529 .vmux = 0, 1535 .vmux = 0,
1530 .amux = LINE1, 1536 .amux = LINE1,
1531 }}, 1537 }},
1532 .mute = { 1538 .mute = {
1533 .name = name_mute, 1539 .type = SAA7134_INPUT_MUTE,
1534 .amux = LINE2, 1540 .amux = LINE2,
1535 }, 1541 },
1536 }, 1542 },
@@ -1544,29 +1550,29 @@ struct saa7134_board saa7134_boards[] = {
1544 .radio_addr = ADDR_UNSET, 1550 .radio_addr = ADDR_UNSET,
1545 .gpiomask = 0x808c0080, 1551 .gpiomask = 0x808c0080,
1546 .inputs = {{ 1552 .inputs = {{
1547 .name = name_svideo, 1553 .type = SAA7134_INPUT_SVIDEO,
1548 .vmux = 8, 1554 .vmux = 8,
1549 .amux = LINE1, 1555 .amux = LINE1,
1550 .gpio = 0x00080, 1556 .gpio = 0x00080,
1551 },{ 1557 },{
1552 .name = name_comp1, 1558 .type = SAA7134_INPUT_COMPOSITE1,
1553 .vmux = 3, 1559 .vmux = 3,
1554 .amux = LINE1, 1560 .amux = LINE1,
1555 .gpio = 0x00080, 1561 .gpio = 0x00080,
1556 },{ 1562 },{
1557 .name = name_tv, 1563 .type = SAA7134_INPUT_TV,
1558 .vmux = 1, 1564 .vmux = 1,
1559 .amux = LINE2_LEFT, 1565 .amux = LINE2_LEFT,
1560 .tv = 1, 1566 .tv = 1,
1561 .gpio = 0x00080, 1567 .gpio = 0x00080,
1562 }}, 1568 }},
1563 .radio = { 1569 .radio = {
1564 .name = name_radio, 1570 .type = SAA7134_INPUT_RADIO,
1565 .amux = LINE2, 1571 .amux = LINE2,
1566 .gpio = 0x80000, 1572 .gpio = 0x80000,
1567 }, 1573 },
1568 .mute = { 1574 .mute = {
1569 .name = name_mute, 1575 .type = SAA7134_INPUT_MUTE,
1570 .amux = LINE2, 1576 .amux = LINE2,
1571 .gpio = 0x40000, 1577 .gpio = 0x40000,
1572 }, 1578 },
@@ -1580,21 +1586,21 @@ struct saa7134_board saa7134_boards[] = {
1580 .tuner_addr = ADDR_UNSET, 1586 .tuner_addr = ADDR_UNSET,
1581 .radio_addr = ADDR_UNSET, 1587 .radio_addr = ADDR_UNSET,
1582 .inputs = {{ 1588 .inputs = {{
1583 .name = name_comp1, 1589 .type = SAA7134_INPUT_COMPOSITE1,
1584 .vmux = 1, 1590 .vmux = 1,
1585 .amux = LINE1, 1591 .amux = LINE1,
1586 },{ 1592 },{
1587 .name = name_tv, 1593 .type = SAA7134_INPUT_TV,
1588 .vmux = 3, 1594 .vmux = 3,
1589 .amux = LINE2, 1595 .amux = LINE2,
1590 .tv = 1, 1596 .tv = 1,
1591 },{ 1597 },{
1592 .name = name_svideo, 1598 .type = SAA7134_INPUT_SVIDEO,
1593 .vmux = 8, 1599 .vmux = 8,
1594 .amux = LINE1, 1600 .amux = LINE1,
1595 }}, 1601 }},
1596 .radio = { 1602 .radio = {
1597 .name = name_radio, 1603 .type = SAA7134_INPUT_RADIO,
1598 .amux = LINE2, 1604 .amux = LINE2,
1599 }, 1605 },
1600 }, 1606 },
@@ -1607,15 +1613,15 @@ struct saa7134_board saa7134_boards[] = {
1607 .tuner_addr = ADDR_UNSET, 1613 .tuner_addr = ADDR_UNSET,
1608 .radio_addr = ADDR_UNSET, 1614 .radio_addr = ADDR_UNSET,
1609 .inputs = {{ 1615 .inputs = {{
1610 .name = name_svideo, 1616 .type = SAA7134_INPUT_SVIDEO,
1611 .vmux = 8, 1617 .vmux = 8,
1612 .amux = LINE1, 1618 .amux = LINE1,
1613 },{ 1619 },{
1614 .name = name_comp1, 1620 .type = SAA7134_INPUT_COMPOSITE1,
1615 .vmux = 3, 1621 .vmux = 3,
1616 .amux = LINE1, 1622 .amux = LINE1,
1617 },{ 1623 },{
1618 .name = name_tv, 1624 .type = SAA7134_INPUT_TV,
1619 .vmux = 1, 1625 .vmux = 1,
1620 .amux = LINE2, 1626 .amux = LINE2,
1621 .tv = 1, 1627 .tv = 1,
@@ -1631,29 +1637,29 @@ struct saa7134_board saa7134_boards[] = {
1631 .radio_addr = ADDR_UNSET, 1637 .radio_addr = ADDR_UNSET,
1632 .gpiomask = 0x4000, 1638 .gpiomask = 0x4000,
1633 .inputs = {{ 1639 .inputs = {{
1634 .name = name_tv_mono, 1640 .type = SAA7134_INPUT_TV_MONO,
1635 .vmux = 1, 1641 .vmux = 1,
1636 .amux = LINE2, 1642 .amux = LINE2,
1637 .gpio = 0x8000, 1643 .gpio = 0x8000,
1638 .tv = 1, 1644 .tv = 1,
1639 },{ 1645 },{
1640 .name = name_comp1, 1646 .type = SAA7134_INPUT_COMPOSITE1,
1641 .vmux = 3, 1647 .vmux = 3,
1642 .amux = LINE1, 1648 .amux = LINE1,
1643 .gpio = 0x8000, 1649 .gpio = 0x8000,
1644 },{ 1650 },{
1645 .name = name_svideo, 1651 .type = SAA7134_INPUT_SVIDEO,
1646 .vmux = 6, 1652 .vmux = 6,
1647 .amux = LINE1, 1653 .amux = LINE1,
1648 .gpio = 0x8000, 1654 .gpio = 0x8000,
1649 }}, 1655 }},
1650 .radio = { 1656 .radio = {
1651 .name = name_radio, 1657 .type = SAA7134_INPUT_RADIO,
1652 .amux = LINE1, 1658 .amux = LINE1,
1653 .gpio = 0x8000, 1659 .gpio = 0x8000,
1654 }, 1660 },
1655 .mute = { 1661 .mute = {
1656 .name = name_mute, 1662 .type = SAA7134_INPUT_MUTE,
1657 .amux = TV, 1663 .amux = TV,
1658 .gpio =0x8000, 1664 .gpio =0x8000,
1659 } 1665 }
@@ -1672,29 +1678,29 @@ struct saa7134_board saa7134_boards[] = {
1672 .tda9887_conf = TDA9887_PRESENT, 1678 .tda9887_conf = TDA9887_PRESENT,
1673 .gpiomask = 0x03, 1679 .gpiomask = 0x03,
1674 .inputs = {{ 1680 .inputs = {{
1675 .name = name_tv, 1681 .type = SAA7134_INPUT_TV,
1676 .vmux = 1, 1682 .vmux = 1,
1677 .amux = TV, 1683 .amux = TV,
1678 .tv = 1, 1684 .tv = 1,
1679 .gpio = 0x00, 1685 .gpio = 0x00,
1680 },{ 1686 },{
1681 .name = name_comp, 1687 .type = SAA7134_INPUT_COMPOSITE,
1682 .vmux = 3, 1688 .vmux = 3,
1683 .amux = LINE1, 1689 .amux = LINE1,
1684 .gpio = 0x02, 1690 .gpio = 0x02,
1685 },{ 1691 },{
1686 .name = name_svideo, 1692 .type = SAA7134_INPUT_SVIDEO,
1687 .vmux = 8, 1693 .vmux = 8,
1688 .amux = LINE1, 1694 .amux = LINE1,
1689 .gpio = 0x02, 1695 .gpio = 0x02,
1690 }}, 1696 }},
1691 .radio = { 1697 .radio = {
1692 .name = name_radio, 1698 .type = SAA7134_INPUT_RADIO,
1693 .amux = LINE1, 1699 .amux = LINE1,
1694 .gpio = 0x01, 1700 .gpio = 0x01,
1695 }, 1701 },
1696 .mute = { 1702 .mute = {
1697 .name = name_mute, 1703 .type = SAA7134_INPUT_MUTE,
1698 .amux = LINE1, 1704 .amux = LINE1,
1699 .gpio = 0x00, 1705 .gpio = 0x00,
1700 }, 1706 },
@@ -1709,29 +1715,29 @@ struct saa7134_board saa7134_boards[] = {
1709 .gpiomask = 0x00300003, 1715 .gpiomask = 0x00300003,
1710 /* .gpiomask = 0x8c240003, */ 1716 /* .gpiomask = 0x8c240003, */
1711 .inputs = {{ 1717 .inputs = {{
1712 .name = name_tv, 1718 .type = SAA7134_INPUT_TV,
1713 .vmux = 1, 1719 .vmux = 1,
1714 .amux = TV, 1720 .amux = TV,
1715 .tv = 1, 1721 .tv = 1,
1716 .gpio = 0x01, 1722 .gpio = 0x01,
1717 },{ 1723 },{
1718 .name = name_comp1, 1724 .type = SAA7134_INPUT_COMPOSITE1,
1719 .vmux = 0, 1725 .vmux = 0,
1720 .amux = LINE1, 1726 .amux = LINE1,
1721 .gpio = 0x02, 1727 .gpio = 0x02,
1722 },{ 1728 },{
1723 .name = name_svideo, 1729 .type = SAA7134_INPUT_SVIDEO,
1724 .vmux = 6, 1730 .vmux = 6,
1725 .amux = LINE1, 1731 .amux = LINE1,
1726 .gpio = 0x02, 1732 .gpio = 0x02,
1727 }}, 1733 }},
1728 .radio = { 1734 .radio = {
1729 .name = name_radio, 1735 .type = SAA7134_INPUT_RADIO,
1730 .amux = TV, 1736 .amux = TV,
1731 .gpio = 0x00300001, 1737 .gpio = 0x00300001,
1732 }, 1738 },
1733 .mute = { 1739 .mute = {
1734 .name = name_mute, 1740 .type = SAA7134_INPUT_MUTE,
1735 .amux = TV, 1741 .amux = TV,
1736 .gpio = 0x01, 1742 .gpio = 0x01,
1737 }, 1743 },
@@ -1745,21 +1751,21 @@ struct saa7134_board saa7134_boards[] = {
1745 .tuner_addr = ADDR_UNSET, 1751 .tuner_addr = ADDR_UNSET,
1746 .radio_addr = ADDR_UNSET, 1752 .radio_addr = ADDR_UNSET,
1747 .inputs = {{ 1753 .inputs = {{
1748 .name = name_tv, 1754 .type = SAA7134_INPUT_TV,
1749 .vmux = 1, 1755 .vmux = 1,
1750 .amux = TV, 1756 .amux = TV,
1751 .tv = 1, 1757 .tv = 1,
1752 },{ 1758 },{
1753 .name = name_comp1, 1759 .type = SAA7134_INPUT_COMPOSITE1,
1754 .vmux = 3, 1760 .vmux = 3,
1755 .amux = LINE2, 1761 .amux = LINE2,
1756 },{ 1762 },{
1757 .name = name_svideo, 1763 .type = SAA7134_INPUT_SVIDEO,
1758 .vmux = 8, 1764 .vmux = 8,
1759 .amux = LINE1, 1765 .amux = LINE1,
1760 }}, 1766 }},
1761 .radio = { 1767 .radio = {
1762 .name = name_radio, 1768 .type = SAA7134_INPUT_RADIO,
1763 .amux = LINE1, 1769 .amux = LINE1,
1764 }, 1770 },
1765 }, 1771 },
@@ -1774,24 +1780,24 @@ struct saa7134_board saa7134_boards[] = {
1774 .tda9887_conf = TDA9887_PRESENT, 1780 .tda9887_conf = TDA9887_PRESENT,
1775 .gpiomask = 0x08000000, 1781 .gpiomask = 0x08000000,
1776 .inputs = { { 1782 .inputs = { {
1777 .name = name_tv, 1783 .type = SAA7134_INPUT_TV,
1778 .vmux = 1, 1784 .vmux = 1,
1779 .amux = TV, 1785 .amux = TV,
1780 .tv = 1, 1786 .tv = 1,
1781 .gpio = 0x08000000, 1787 .gpio = 0x08000000,
1782 }, { 1788 }, {
1783 .name = name_comp1, 1789 .type = SAA7134_INPUT_COMPOSITE1,
1784 .vmux = 3, 1790 .vmux = 3,
1785 .amux = LINE1, 1791 .amux = LINE1,
1786 .gpio = 0x08000000, 1792 .gpio = 0x08000000,
1787 }, { 1793 }, {
1788 .name = name_svideo, 1794 .type = SAA7134_INPUT_SVIDEO,
1789 .vmux = 8, 1795 .vmux = 8,
1790 .amux = LINE1, 1796 .amux = LINE1,
1791 .gpio = 0x08000000, 1797 .gpio = 0x08000000,
1792 } }, 1798 } },
1793 .radio = { 1799 .radio = {
1794 .name = name_radio, 1800 .type = SAA7134_INPUT_RADIO,
1795 .amux = LINE2, 1801 .amux = LINE2,
1796 .gpio = 0x00000000, 1802 .gpio = 0x00000000,
1797 }, 1803 },
@@ -1805,21 +1811,21 @@ struct saa7134_board saa7134_boards[] = {
1805 .radio_addr = ADDR_UNSET, 1811 .radio_addr = ADDR_UNSET,
1806 .tda9887_conf = TDA9887_PRESENT, 1812 .tda9887_conf = TDA9887_PRESENT,
1807 .inputs = {{ 1813 .inputs = {{
1808 .name = name_tv, 1814 .type = SAA7134_INPUT_TV,
1809 .vmux = 1, 1815 .vmux = 1,
1810 .amux = TV, 1816 .amux = TV,
1811 .tv = 1, 1817 .tv = 1,
1812 },{ 1818 },{
1813 .name = name_tv_mono, 1819 .type = SAA7134_INPUT_TV_MONO,
1814 .vmux = 1, 1820 .vmux = 1,
1815 .amux = LINE2, 1821 .amux = LINE2,
1816 .tv = 1, 1822 .tv = 1,
1817 },{ 1823 },{
1818 .name = name_comp1, 1824 .type = SAA7134_INPUT_COMPOSITE1,
1819 .vmux = 3, 1825 .vmux = 3,
1820 .amux = LINE1, 1826 .amux = LINE1,
1821 },{ 1827 },{
1822 .name = name_svideo, 1828 .type = SAA7134_INPUT_SVIDEO,
1823 .vmux = 8, 1829 .vmux = 8,
1824 .amux = LINE1, 1830 .amux = LINE1,
1825 }}, 1831 }},
@@ -1834,25 +1840,25 @@ struct saa7134_board saa7134_boards[] = {
1834 .rds_addr = 0x10, 1840 .rds_addr = 0x10,
1835 .tda9887_conf = TDA9887_PRESENT, 1841 .tda9887_conf = TDA9887_PRESENT,
1836 .inputs = {{ 1842 .inputs = {{
1837 .name = name_tv, 1843 .type = SAA7134_INPUT_TV,
1838 .vmux = 1, 1844 .vmux = 1,
1839 .amux = TV, 1845 .amux = TV,
1840 .tv = 1, 1846 .tv = 1,
1841 },{ 1847 },{
1842 .name = name_comp1, 1848 .type = SAA7134_INPUT_COMPOSITE1,
1843 .vmux = 4, 1849 .vmux = 4,
1844 .amux = LINE1, 1850 .amux = LINE1,
1845 },{ 1851 },{
1846 .name = name_svideo, 1852 .type = SAA7134_INPUT_SVIDEO,
1847 .vmux = 8, 1853 .vmux = 8,
1848 .amux = LINE1, 1854 .amux = LINE1,
1849 },{ 1855 },{
1850 .name = name_comp2, /* CVideo over SVideo Connector */ 1856 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
1851 .vmux = 0, 1857 .vmux = 0,
1852 .amux = LINE1, 1858 .amux = LINE1,
1853 }}, 1859 }},
1854 .radio = { 1860 .radio = {
1855 .name = name_radio, 1861 .type = SAA7134_INPUT_RADIO,
1856 .amux = LINE2, 1862 .amux = LINE2,
1857 }, 1863 },
1858 }, 1864 },
@@ -1866,29 +1872,29 @@ struct saa7134_board saa7134_boards[] = {
1866 .radio_addr = ADDR_UNSET, 1872 .radio_addr = ADDR_UNSET,
1867 .gpiomask = 0x1ce780, 1873 .gpiomask = 0x1ce780,
1868 .inputs = {{ 1874 .inputs = {{
1869 .name = name_svideo, 1875 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
1870 .vmux = 0, /* CVideo over SVideo Connector - ok? */ 1876 .vmux = 0,
1871 .amux = LINE1, 1877 .amux = LINE1,
1872 .gpio = 0x008080, 1878 .gpio = 0x008080,
1873 },{ 1879 },{
1874 .name = name_comp1, 1880 .type = SAA7134_INPUT_COMPOSITE1,
1875 .vmux = 3, 1881 .vmux = 3,
1876 .amux = LINE1, 1882 .amux = LINE1,
1877 .gpio = 0x008080, 1883 .gpio = 0x008080,
1878 },{ 1884 },{
1879 .name = name_tv, 1885 .type = SAA7134_INPUT_TV,
1880 .vmux = 1, 1886 .vmux = 1,
1881 .amux = TV, 1887 .amux = TV,
1882 .tv = 1, 1888 .tv = 1,
1883 .gpio = 0x008080, 1889 .gpio = 0x008080,
1884 }}, 1890 }},
1885 .radio = { 1891 .radio = {
1886 .name = name_radio, 1892 .type = SAA7134_INPUT_RADIO,
1887 .amux = LINE2, 1893 .amux = LINE2,
1888 .gpio = 0x80000, 1894 .gpio = 0x80000,
1889 }, 1895 },
1890 .mute = { 1896 .mute = {
1891 .name = name_mute, 1897 .type = SAA7134_INPUT_MUTE,
1892 .amux = LINE2, 1898 .amux = LINE2,
1893 .gpio = 0x0c8000, 1899 .gpio = 0x0c8000,
1894 }, 1900 },
@@ -1903,20 +1909,20 @@ struct saa7134_board saa7134_boards[] = {
1903 .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE, 1909 .tda9887_conf = TDA9887_PRESENT | TDA9887_INTERCARRIER | TDA9887_PORT2_INACTIVE,
1904 .mpeg = SAA7134_MPEG_DVB, 1910 .mpeg = SAA7134_MPEG_DVB,
1905 .inputs = {{ 1911 .inputs = {{
1906 .name = name_tv, 1912 .type = SAA7134_INPUT_TV,
1907 .vmux = 3, 1913 .vmux = 3,
1908 .amux = TV, 1914 .amux = TV,
1909 .tv = 1, 1915 .tv = 1,
1910 },{ 1916 },{
1911 .name = name_comp1, 1917 .type = SAA7134_INPUT_COMPOSITE1,
1912 .vmux = 0, 1918 .vmux = 0,
1913 .amux = LINE2, 1919 .amux = LINE2,
1914 },{ 1920 },{
1915 .name = name_comp2, 1921 .type = SAA7134_INPUT_COMPOSITE2,
1916 .vmux = 1, 1922 .vmux = 1,
1917 .amux = LINE2, 1923 .amux = LINE2,
1918 },{ 1924 },{
1919 .name = name_svideo, 1925 .type = SAA7134_INPUT_SVIDEO,
1920 .vmux = 8, 1926 .vmux = 8,
1921 .amux = LINE2, 1927 .amux = LINE2,
1922 }}, 1928 }},
@@ -1931,22 +1937,22 @@ struct saa7134_board saa7134_boards[] = {
1931 .radio_addr = ADDR_UNSET, 1937 .radio_addr = ADDR_UNSET,
1932 .tda9887_conf = TDA9887_PRESENT, 1938 .tda9887_conf = TDA9887_PRESENT,
1933 .inputs = {{ 1939 .inputs = {{
1934 .name = name_comp1, 1940 .type = SAA7134_INPUT_COMPOSITE1,
1935 .vmux = 0, 1941 .vmux = 0,
1936 .amux = LINE1, 1942 .amux = LINE1,
1937 },{ 1943 },{
1938 .name = name_tv, 1944 .type = SAA7134_INPUT_TV,
1939 .vmux = 1, 1945 .vmux = 1,
1940 .amux = TV, 1946 .amux = TV,
1941 .tv = 1, 1947 .tv = 1,
1942 },{ 1948 },{
1943 .name = name_tv_mono, 1949 .type = SAA7134_INPUT_TV_MONO,
1944 .vmux = 1, 1950 .vmux = 1,
1945 .amux = LINE2, 1951 .amux = LINE2,
1946 .tv = 1, 1952 .tv = 1,
1947 }}, 1953 }},
1948 .radio = { 1954 .radio = {
1949 .name = name_radio, 1955 .type = SAA7134_INPUT_RADIO,
1950 .amux = LINE2, 1956 .amux = LINE2,
1951 }, 1957 },
1952 }, 1958 },
@@ -1961,25 +1967,25 @@ struct saa7134_board saa7134_boards[] = {
1961 .radio_addr = ADDR_UNSET, 1967 .radio_addr = ADDR_UNSET,
1962 .tda9887_conf = TDA9887_PRESENT, 1968 .tda9887_conf = TDA9887_PRESENT,
1963 .inputs = {{ 1969 .inputs = {{
1964 .name = name_tv, 1970 .type = SAA7134_INPUT_TV,
1965 .vmux = 1, 1971 .vmux = 1,
1966 .amux = LINE2, 1972 .amux = LINE2,
1967 .tv = 1, 1973 .tv = 1,
1968 },{ 1974 },{
1969 .name = name_comp1, 1975 .type = SAA7134_INPUT_COMPOSITE1,
1970 .vmux = 0, 1976 .vmux = 0,
1971 .amux = LINE2, 1977 .amux = LINE2,
1972 },{ 1978 },{
1973 .name = name_comp2, 1979 .type = SAA7134_INPUT_COMPOSITE2,
1974 .vmux = 3, 1980 .vmux = 3,
1975 .amux = LINE2, 1981 .amux = LINE2,
1976 },{ 1982 },{
1977 .name = name_svideo, 1983 .type = SAA7134_INPUT_SVIDEO,
1978 .vmux = 8, 1984 .vmux = 8,
1979 .amux = LINE2, 1985 .amux = LINE2,
1980 }}, 1986 }},
1981 .mute = { 1987 .mute = {
1982 .name = name_mute, 1988 .type = SAA7134_INPUT_MUTE,
1983 .amux = LINE1, 1989 .amux = LINE1,
1984 }, 1990 },
1985 }, 1991 },
@@ -1995,26 +2001,26 @@ struct saa7134_board saa7134_boards[] = {
1995 .gpiomask = 0x00200000, 2001 .gpiomask = 0x00200000,
1996 .mpeg = SAA7134_MPEG_DVB, 2002 .mpeg = SAA7134_MPEG_DVB,
1997 .inputs = {{ 2003 .inputs = {{
1998 .name = name_tv, 2004 .type = SAA7134_INPUT_TV,
1999 .vmux = 1, 2005 .vmux = 1,
2000 .amux = TV, 2006 .amux = TV,
2001 .gpio = 0x200000, /* GPIO21=High for TV input */ 2007 .gpio = 0x200000, /* GPIO21=High for TV input */
2002 .tv = 1, 2008 .tv = 1,
2003 },{ 2009 },{
2004 .name = name_comp1, /* Composite signal on S-Video input */ 2010 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
2005 .vmux = 0, 2011 .vmux = 0,
2006 .amux = LINE2, 2012 .amux = LINE2,
2007 },{ 2013 },{
2008 .name = name_comp2, /* Composite input */ 2014 .type = SAA7134_INPUT_COMPOSITE,
2009 .vmux = 3, 2015 .vmux = 3,
2010 .amux = LINE2, 2016 .amux = LINE2,
2011 },{ 2017 },{
2012 .name = name_svideo, /* S-Video signal on S-Video input */ 2018 .type = SAA7134_INPUT_SVIDEO,
2013 .vmux = 8, 2019 .vmux = 8,
2014 .amux = LINE2, 2020 .amux = LINE2,
2015 }}, 2021 }},
2016 .radio = { 2022 .radio = {
2017 .name = name_radio, 2023 .type = SAA7134_INPUT_RADIO,
2018 .amux = TV, 2024 .amux = TV,
2019 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */ 2025 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */
2020 }, 2026 },
@@ -2028,11 +2034,11 @@ struct saa7134_board saa7134_boards[] = {
2028 .radio_addr = ADDR_UNSET, 2034 .radio_addr = ADDR_UNSET,
2029 .mpeg = SAA7134_MPEG_DVB, 2035 .mpeg = SAA7134_MPEG_DVB,
2030 .inputs = {{ 2036 .inputs = {{
2031 .name = name_comp1, 2037 .type = SAA7134_INPUT_COMPOSITE1,
2032 .vmux = 0, 2038 .vmux = 0,
2033 .amux = LINE1, 2039 .amux = LINE1,
2034 },{ 2040 },{
2035 .name = name_svideo, 2041 .type = SAA7134_INPUT_SVIDEO,
2036 .vmux = 8, 2042 .vmux = 8,
2037 .amux = LINE1, 2043 .amux = LINE1,
2038 }}, 2044 }},
@@ -2049,20 +2055,20 @@ struct saa7134_board saa7134_boards[] = {
2049 .radio_addr = ADDR_UNSET, 2055 .radio_addr = ADDR_UNSET,
2050 .tda9887_conf = TDA9887_PRESENT, 2056 .tda9887_conf = TDA9887_PRESENT,
2051 .inputs = {{ 2057 .inputs = {{
2052 .name = name_tv, 2058 .type = SAA7134_INPUT_TV,
2053 .vmux = 1, 2059 .vmux = 1,
2054 .amux = TV, 2060 .amux = TV,
2055 .tv = 1, 2061 .tv = 1,
2056 },{ 2062 },{
2057 .name = name_comp1, 2063 .type = SAA7134_INPUT_COMPOSITE1,
2058 .vmux = 0, 2064 .vmux = 0,
2059 .amux = LINE1, 2065 .amux = LINE1,
2060 },{ 2066 },{
2061 .name = name_comp2, 2067 .type = SAA7134_INPUT_COMPOSITE2,
2062 .vmux = 3, 2068 .vmux = 3,
2063 .amux = LINE1, 2069 .amux = LINE1,
2064 },{ 2070 },{
2065 .name = name_svideo, 2071 .type = SAA7134_INPUT_SVIDEO,
2066 .vmux = 8, 2072 .vmux = 8,
2067 .amux = LINE1, 2073 .amux = LINE1,
2068 }}, 2074 }},
@@ -2075,16 +2081,16 @@ struct saa7134_board saa7134_boards[] = {
2075 .tuner_addr = ADDR_UNSET, 2081 .tuner_addr = ADDR_UNSET,
2076 .radio_addr = ADDR_UNSET, 2082 .radio_addr = ADDR_UNSET,
2077 .inputs = {{ 2083 .inputs = {{
2078 .name = name_tv, 2084 .type = SAA7134_INPUT_TV,
2079 .vmux = 1, 2085 .vmux = 1,
2080 .amux = TV, 2086 .amux = TV,
2081 .tv = 1, 2087 .tv = 1,
2082 },{ 2088 },{
2083 .name = name_comp1, 2089 .type = SAA7134_INPUT_COMPOSITE1,
2084 .vmux = 3, 2090 .vmux = 3,
2085 .amux = LINE2, 2091 .amux = LINE2,
2086 },{ 2092 },{
2087 .name = name_svideo, 2093 .type = SAA7134_INPUT_SVIDEO,
2088 .vmux = 8, 2094 .vmux = 8,
2089 .amux = LINE2, 2095 .amux = LINE2,
2090 }}, 2096 }},
@@ -2098,29 +2104,29 @@ struct saa7134_board saa7134_boards[] = {
2098 .radio_addr = ADDR_UNSET, 2104 .radio_addr = ADDR_UNSET,
2099 .gpiomask = 0x0700, 2105 .gpiomask = 0x0700,
2100 .inputs = {{ 2106 .inputs = {{
2101 .name = name_tv, 2107 .type = SAA7134_INPUT_TV,
2102 .vmux = 1, 2108 .vmux = 1,
2103 .amux = TV, 2109 .amux = TV,
2104 .tv = 1, 2110 .tv = 1,
2105 .gpio = 0x000, 2111 .gpio = 0x000,
2106 },{ 2112 },{
2107 .name = name_comp1, 2113 .type = SAA7134_INPUT_COMPOSITE1,
2108 .vmux = 3, 2114 .vmux = 3,
2109 .amux = LINE1, 2115 .amux = LINE1,
2110 .gpio = 0x200, /* gpio by DScaler */ 2116 .gpio = 0x200, /* gpio by DScaler */
2111 },{ 2117 },{
2112 .name = name_svideo, 2118 .type = SAA7134_INPUT_SVIDEO,
2113 .vmux = 0, 2119 .vmux = 0,
2114 .amux = LINE1, 2120 .amux = LINE1,
2115 .gpio = 0x200, 2121 .gpio = 0x200,
2116 }}, 2122 }},
2117 .radio = { 2123 .radio = {
2118 .name = name_radio, 2124 .type = SAA7134_INPUT_RADIO,
2119 .amux = LINE1, 2125 .amux = LINE1,
2120 .gpio = 0x100, 2126 .gpio = 0x100,
2121 }, 2127 },
2122 .mute = { 2128 .mute = {
2123 .name = name_mute, 2129 .type = SAA7134_INPUT_MUTE,
2124 .amux = TV, 2130 .amux = TV,
2125 .gpio = 0x000, 2131 .gpio = 0x000,
2126 }, 2132 },
@@ -2135,26 +2141,26 @@ struct saa7134_board saa7134_boards[] = {
2135 .mpeg = SAA7134_MPEG_DVB, 2141 .mpeg = SAA7134_MPEG_DVB,
2136 .gpiomask = 0x00200000, 2142 .gpiomask = 0x00200000,
2137 .inputs = {{ 2143 .inputs = {{
2138 .name = name_tv, 2144 .type = SAA7134_INPUT_TV,
2139 .vmux = 1, 2145 .vmux = 1,
2140 .amux = TV, 2146 .amux = TV,
2141 .gpio = 0x200000, /* GPIO21=High for TV input */ 2147 .gpio = 0x200000, /* GPIO21=High for TV input */
2142 .tv = 1, 2148 .tv = 1,
2143 },{ 2149 },{
2144 .name = name_svideo, /* S-Video signal on S-Video input */ 2150 .type = SAA7134_INPUT_SVIDEO,
2145 .vmux = 8, 2151 .vmux = 8,
2146 .amux = LINE2, 2152 .amux = LINE2,
2147 },{ 2153 },{
2148 .name = name_comp1, /* Composite signal on S-Video input */ 2154 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
2149 .vmux = 0, 2155 .vmux = 0,
2150 .amux = LINE2, 2156 .amux = LINE2,
2151 },{ 2157 },{
2152 .name = name_comp2, /* Composite input */ 2158 .type = SAA7134_INPUT_COMPOSITE2,
2153 .vmux = 3, 2159 .vmux = 3,
2154 .amux = LINE2, 2160 .amux = LINE2,
2155 }}, 2161 }},
2156 .radio = { 2162 .radio = {
2157 .name = name_radio, 2163 .type = SAA7134_INPUT_RADIO,
2158 .amux = TV, 2164 .amux = TV,
2159 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */ 2165 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */
2160 }, 2166 },
@@ -2168,29 +2174,29 @@ struct saa7134_board saa7134_boards[] = {
2168 .radio_addr = 0x60, 2174 .radio_addr = 0x60,
2169 .gpiomask = 0x8c1880, 2175 .gpiomask = 0x8c1880,
2170 .inputs = {{ 2176 .inputs = {{
2171 .name = name_svideo, 2177 .type = SAA7134_INPUT_SVIDEO,
2172 .vmux = 0, 2178 .vmux = 0,
2173 .amux = LINE1, 2179 .amux = LINE1,
2174 .gpio = 0x800800, 2180 .gpio = 0x800800,
2175 },{ 2181 },{
2176 .name = name_comp1, 2182 .type = SAA7134_INPUT_COMPOSITE1,
2177 .vmux = 3, 2183 .vmux = 3,
2178 .amux = LINE1, 2184 .amux = LINE1,
2179 .gpio = 0x801000, 2185 .gpio = 0x801000,
2180 },{ 2186 },{
2181 .name = name_tv, 2187 .type = SAA7134_INPUT_TV,
2182 .vmux = 1, 2188 .vmux = 1,
2183 .amux = TV, 2189 .amux = TV,
2184 .tv = 1, 2190 .tv = 1,
2185 .gpio = 0x800000, 2191 .gpio = 0x800000,
2186 }}, 2192 }},
2187 .radio = { 2193 .radio = {
2188 .name = name_radio, 2194 .type = SAA7134_INPUT_RADIO,
2189 .amux = TV, 2195 .amux = TV,
2190 .gpio = 0x880000, 2196 .gpio = 0x880000,
2191 }, 2197 },
2192 .mute = { 2198 .mute = {
2193 .name = name_mute, 2199 .type = SAA7134_INPUT_MUTE,
2194 .amux = LINE2, 2200 .amux = LINE2,
2195 .gpio = 0x840000, 2201 .gpio = 0x840000,
2196 }, 2202 },
@@ -2213,29 +2219,29 @@ struct saa7134_board saa7134_boards[] = {
2213 .radio_addr = 0x60, 2219 .radio_addr = 0x60,
2214 .gpiomask = 0x0700, 2220 .gpiomask = 0x0700,
2215 .inputs = {{ 2221 .inputs = {{
2216 .name = name_tv, 2222 .type = SAA7134_INPUT_TV,
2217 .vmux = 1, 2223 .vmux = 1,
2218 .amux = TV, 2224 .amux = TV,
2219 .tv = 1, 2225 .tv = 1,
2220 .gpio = 0x000, 2226 .gpio = 0x000,
2221 },{ 2227 },{
2222 .name = name_comp1, 2228 .type = SAA7134_INPUT_COMPOSITE1,
2223 .vmux = 3, 2229 .vmux = 3,
2224 .amux = LINE1, 2230 .amux = LINE1,
2225 .gpio = 0x200, /* gpio by DScaler */ 2231 .gpio = 0x200, /* gpio by DScaler */
2226 },{ 2232 },{
2227 .name = name_svideo, 2233 .type = SAA7134_INPUT_SVIDEO,
2228 .vmux = 0, 2234 .vmux = 0,
2229 .amux = LINE1, 2235 .amux = LINE1,
2230 .gpio = 0x200, 2236 .gpio = 0x200,
2231 }}, 2237 }},
2232 .radio = { 2238 .radio = {
2233 .name = name_radio, 2239 .type = SAA7134_INPUT_RADIO,
2234 .amux = LINE1, 2240 .amux = LINE1,
2235 .gpio = 0x100, 2241 .gpio = 0x100,
2236 }, 2242 },
2237 .mute = { 2243 .mute = {
2238 .name = name_mute, 2244 .type = SAA7134_INPUT_MUTE,
2239 .amux = TV, 2245 .amux = TV,
2240 .gpio = 0x000, 2246 .gpio = 0x000,
2241 }, 2247 },
@@ -2248,30 +2254,30 @@ struct saa7134_board saa7134_boards[] = {
2248 .tuner_addr = ADDR_UNSET, 2254 .tuner_addr = ADDR_UNSET,
2249 .radio_addr = ADDR_UNSET, 2255 .radio_addr = ADDR_UNSET,
2250 .inputs = {{ 2256 .inputs = {{
2251 .name = name_tv, 2257 .type = SAA7134_INPUT_TV,
2252 .vmux = 1, 2258 .vmux = 1,
2253 .amux = TV, 2259 .amux = TV,
2254 .tv = 1, 2260 .tv = 1,
2255 },{ 2261 },{
2256 .name = name_tv_mono, 2262 .type = SAA7134_INPUT_TV_MONO,
2257 .vmux = 1, 2263 .vmux = 1,
2258 .amux = LINE2, 2264 .amux = LINE2,
2259 .tv = 1, 2265 .tv = 1,
2260 },{ 2266 },{
2261 .name = name_comp1, 2267 .type = SAA7134_INPUT_COMPOSITE1,
2262 .vmux = 0, 2268 .vmux = 0,
2263 .amux = LINE2, 2269 .amux = LINE2,
2264 },{ 2270 },{
2265 .name = name_comp2, 2271 .type = SAA7134_INPUT_COMPOSITE2,
2266 .vmux = 3, 2272 .vmux = 3,
2267 .amux = LINE2, 2273 .amux = LINE2,
2268 },{ 2274 },{
2269 .name = name_svideo, 2275 .type = SAA7134_INPUT_SVIDEO,
2270 .vmux = 8, 2276 .vmux = 8,
2271 .amux = LINE2, 2277 .amux = LINE2,
2272 }}, 2278 }},
2273 .radio = { 2279 .radio = {
2274 .name = name_radio, /* radio unconfirmed */ 2280 .type = SAA7134_INPUT_RADIO, /* radio unconfirmed */
2275 .amux = LINE2, 2281 .amux = LINE2,
2276 }, 2282 },
2277 }, 2283 },
@@ -2286,24 +2292,24 @@ struct saa7134_board saa7134_boards[] = {
2286 .radio_addr = ADDR_UNSET, 2292 .radio_addr = ADDR_UNSET,
2287 .gpiomask = 1 << 21, 2293 .gpiomask = 1 << 21,
2288 .inputs = {{ 2294 .inputs = {{
2289 .name = name_tv, 2295 .type = SAA7134_INPUT_TV,
2290 .vmux = 1, 2296 .vmux = 1,
2291 .amux = TV, 2297 .amux = TV,
2292 .gpio = 0x0000000, 2298 .gpio = 0x0000000,
2293 .tv = 1, 2299 .tv = 1,
2294 },{ 2300 },{
2295 .name = name_comp1, /* Composite input */ 2301 .type = SAA7134_INPUT_COMPOSITE1,
2296 .vmux = 3, 2302 .vmux = 3,
2297 .amux = LINE2, 2303 .amux = LINE2,
2298 .gpio = 0x0000000, 2304 .gpio = 0x0000000,
2299 },{ 2305 },{
2300 .name = name_svideo, /* S-Video input */ 2306 .type = SAA7134_INPUT_SVIDEO,
2301 .vmux = 8, 2307 .vmux = 8,
2302 .amux = LINE2, 2308 .amux = LINE2,
2303 .gpio = 0x0000000, 2309 .gpio = 0x0000000,
2304 }}, 2310 }},
2305 .radio = { 2311 .radio = {
2306 .name = name_radio, 2312 .type = SAA7134_INPUT_RADIO,
2307 .amux = TV, 2313 .amux = TV,
2308 .gpio = 0x0200000, 2314 .gpio = 0x0200000,
2309 }, 2315 },
@@ -2322,29 +2328,29 @@ struct saa7134_board saa7134_boards[] = {
2322 .radio_addr= ADDR_UNSET, 2328 .radio_addr= ADDR_UNSET,
2323 .gpiomask = 0x00010003, 2329 .gpiomask = 0x00010003,
2324 .inputs = {{ 2330 .inputs = {{
2325 .name = name_tv, 2331 .type = SAA7134_INPUT_TV,
2326 .vmux = 1, 2332 .vmux = 1,
2327 .amux = TV, 2333 .amux = TV,
2328 .tv = 1, 2334 .tv = 1,
2329 .gpio = 0x01, 2335 .gpio = 0x01,
2330 },{ 2336 },{
2331 .name = name_comp1, 2337 .type = SAA7134_INPUT_COMPOSITE1,
2332 .vmux = 0, 2338 .vmux = 0,
2333 .amux = LINE2, 2339 .amux = LINE2,
2334 .gpio = 0x02, 2340 .gpio = 0x02,
2335 },{ 2341 },{
2336 .name = name_svideo, 2342 .type = SAA7134_INPUT_SVIDEO,
2337 .vmux = 6, 2343 .vmux = 6,
2338 .amux = LINE2, 2344 .amux = LINE2,
2339 .gpio = 0x02, 2345 .gpio = 0x02,
2340 }}, 2346 }},
2341 .radio = { 2347 .radio = {
2342 .name = name_radio, 2348 .type = SAA7134_INPUT_RADIO,
2343 .amux = LINE1, 2349 .amux = LINE1,
2344 .gpio = 0x00010003, 2350 .gpio = 0x00010003,
2345 }, 2351 },
2346 .mute = { 2352 .mute = {
2347 .name = name_mute, 2353 .type = SAA7134_INPUT_MUTE,
2348 .amux = TV, 2354 .amux = TV,
2349 .gpio = 0x01, 2355 .gpio = 0x01,
2350 }, 2356 },
@@ -2362,21 +2368,21 @@ struct saa7134_board saa7134_boards[] = {
2362 .tda9887_conf = TDA9887_PRESENT, 2368 .tda9887_conf = TDA9887_PRESENT,
2363 .gpiomask = 0x00008000, 2369 .gpiomask = 0x00008000,
2364 .inputs = {{ 2370 .inputs = {{
2365 .name = name_tv, 2371 .type = SAA7134_INPUT_TV,
2366 .vmux = 3, 2372 .vmux = 3,
2367 .amux = TV, 2373 .amux = TV,
2368 .tv = 1, 2374 .tv = 1,
2369 },{ 2375 },{
2370 .name = name_comp1, 2376 .type = SAA7134_INPUT_COMPOSITE1,
2371 .vmux = 1, 2377 .vmux = 1,
2372 .amux = LINE1, 2378 .amux = LINE1,
2373 },{ 2379 },{
2374 .name = name_svideo, 2380 .type = SAA7134_INPUT_SVIDEO,
2375 .vmux = 8, 2381 .vmux = 8,
2376 .amux = LINE1, 2382 .amux = LINE1,
2377 }}, 2383 }},
2378 .radio = { 2384 .radio = {
2379 .name = name_radio, 2385 .type = SAA7134_INPUT_RADIO,
2380 .amux = LINE2, 2386 .amux = LINE2,
2381 }, 2387 },
2382 }, 2388 },
@@ -2392,34 +2398,34 @@ struct saa7134_board saa7134_boards[] = {
2392 .tda9887_conf = TDA9887_PRESENT, 2398 .tda9887_conf = TDA9887_PRESENT,
2393 .gpiomask = 0x00200003, 2399 .gpiomask = 0x00200003,
2394 .inputs = {{ 2400 .inputs = {{
2395 .name = name_tv, 2401 .type = SAA7134_INPUT_TV,
2396 .vmux = 1, 2402 .vmux = 1,
2397 .amux = TV, 2403 .amux = TV,
2398 .tv = 1, 2404 .tv = 1,
2399 .gpio = 0x00200003, 2405 .gpio = 0x00200003,
2400 },{ 2406 },{
2401 .name = name_tv_mono, 2407 .type = SAA7134_INPUT_TV_MONO,
2402 .vmux = 1, 2408 .vmux = 1,
2403 .amux = LINE2, 2409 .amux = LINE2,
2404 .gpio = 0x00200003, 2410 .gpio = 0x00200003,
2405 },{ 2411 },{
2406 .name = name_comp1, 2412 .type = SAA7134_INPUT_COMPOSITE1,
2407 .vmux = 3, 2413 .vmux = 3,
2408 .amux = LINE1, 2414 .amux = LINE1,
2409 .gpio = 0x00200003, 2415 .gpio = 0x00200003,
2410 },{ 2416 },{
2411 .name = name_svideo, 2417 .type = SAA7134_INPUT_SVIDEO,
2412 .vmux = 8, 2418 .vmux = 8,
2413 .amux = LINE1, 2419 .amux = LINE1,
2414 .gpio = 0x00200003, 2420 .gpio = 0x00200003,
2415 }}, 2421 }},
2416 .radio = { 2422 .radio = {
2417 .name = name_radio, 2423 .type = SAA7134_INPUT_RADIO,
2418 .amux = LINE2, 2424 .amux = LINE2,
2419 .gpio = 0x00200003, 2425 .gpio = 0x00200003,
2420 }, 2426 },
2421 .mute = { 2427 .mute = {
2422 .name = name_mute, 2428 .type = SAA7134_INPUT_MUTE,
2423 .amux = TV, 2429 .amux = TV,
2424 .gpio = 0x00200003, 2430 .gpio = 0x00200003,
2425 }, 2431 },
@@ -2434,16 +2440,16 @@ struct saa7134_board saa7134_boards[] = {
2434 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, 2440 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
2435 .mpeg = SAA7134_MPEG_DVB, 2441 .mpeg = SAA7134_MPEG_DVB,
2436 .inputs = {{ 2442 .inputs = {{
2437 .name = name_tv, 2443 .type = SAA7134_INPUT_TV,
2438 .vmux = 3, 2444 .vmux = 3,
2439 .amux = TV, 2445 .amux = TV,
2440 .tv = 1, 2446 .tv = 1,
2441 },{ 2447 },{
2442 .name = name_comp1, 2448 .type = SAA7134_INPUT_COMPOSITE1,
2443 .vmux = 0, 2449 .vmux = 0,
2444 .amux = LINE2, 2450 .amux = LINE2,
2445 },{ 2451 },{
2446 .name = name_svideo, 2452 .type = SAA7134_INPUT_SVIDEO,
2447 .vmux = 8, 2453 .vmux = 8,
2448 .amux = LINE2, 2454 .amux = LINE2,
2449 }}, 2455 }},
@@ -2458,16 +2464,16 @@ struct saa7134_board saa7134_boards[] = {
2458 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, 2464 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
2459 .mpeg = SAA7134_MPEG_DVB, 2465 .mpeg = SAA7134_MPEG_DVB,
2460 .inputs = {{ 2466 .inputs = {{
2461 .name = name_tv, 2467 .type = SAA7134_INPUT_TV,
2462 .vmux = 3, 2468 .vmux = 3,
2463 .amux = TV, 2469 .amux = TV,
2464 .tv = 1, 2470 .tv = 1,
2465 },{ 2471 },{
2466 .name = name_comp1, 2472 .type = SAA7134_INPUT_COMPOSITE1,
2467 .vmux = 1, 2473 .vmux = 1,
2468 .amux = LINE2, 2474 .amux = LINE2,
2469 },{ 2475 },{
2470 .name = name_svideo, 2476 .type = SAA7134_INPUT_SVIDEO,
2471 .vmux = 8, 2477 .vmux = 8,
2472 .amux = LINE2, 2478 .amux = LINE2,
2473 }}, 2479 }},
@@ -2481,11 +2487,11 @@ struct saa7134_board saa7134_boards[] = {
2481 .radio_addr = ADDR_UNSET, 2487 .radio_addr = ADDR_UNSET,
2482 .mpeg = SAA7134_MPEG_DVB, 2488 .mpeg = SAA7134_MPEG_DVB,
2483 .inputs = {{ 2489 .inputs = {{
2484 .name = name_comp1, 2490 .type = SAA7134_INPUT_COMPOSITE1,
2485 .vmux = 0, 2491 .vmux = 0,
2486 .amux = LINE1, 2492 .amux = LINE1,
2487 },{ 2493 },{
2488 .name = name_svideo, 2494 .type = SAA7134_INPUT_SVIDEO,
2489 .vmux = 8, 2495 .vmux = 8,
2490 .amux = LINE1, 2496 .amux = LINE1,
2491 }}, 2497 }},
@@ -2499,27 +2505,28 @@ struct saa7134_board saa7134_boards[] = {
2499 .radio_addr = ADDR_UNSET, 2505 .radio_addr = ADDR_UNSET,
2500 .empress_addr = 0x21, 2506 .empress_addr = 0x21,
2501 .inputs = {{ 2507 .inputs = {{
2502 .name = "Composite 0", 2508 .type = SAA7134_INPUT_COMPOSITE0,
2503 .vmux = 0, 2509 .vmux = 0,
2504 .amux = LINE1, 2510 .amux = LINE1,
2505 },{ 2511 },{
2506 .name = "Composite 1", 2512 .type = SAA7134_INPUT_COMPOSITE1,
2507 .vmux = 1, 2513 .vmux = 1,
2508 .amux = LINE2, 2514 .amux = LINE2,
2509 },{ 2515 },{
2510 .name = "Composite 2", 2516 .type = SAA7134_INPUT_COMPOSITE2,
2511 .vmux = 2, 2517 .vmux = 2,
2512 .amux = LINE1, 2518 .amux = LINE1,
2513 },{ 2519 },{
2514 .name = "Composite 3", 2520 .type = SAA7134_INPUT_COMPOSITE3,
2515 .vmux = 3, 2521 .vmux = 3,
2516 .amux = LINE2, 2522 .amux = LINE2,
2517 },{ 2523 },{
2518 .name = "S-Video 0", 2524 .type = SAA7134_INPUT_SVIDEO0,
2525
2519 .vmux = 8, 2526 .vmux = 8,
2520 .amux = LINE1, 2527 .amux = LINE1,
2521 },{ 2528 },{
2522 .name = "S-Video 1", 2529 .type = SAA7134_INPUT_SVIDEO1,
2523 .vmux = 9, 2530 .vmux = 9,
2524 .amux = LINE2, 2531 .amux = LINE2,
2525 }}, 2532 }},
@@ -2538,27 +2545,27 @@ struct saa7134_board saa7134_boards[] = {
2538 .tuner_addr = ADDR_UNSET, 2545 .tuner_addr = ADDR_UNSET,
2539 .radio_addr = ADDR_UNSET, 2546 .radio_addr = ADDR_UNSET,
2540 .inputs = {{ 2547 .inputs = {{
2541 .name = "Composite 0", 2548 .type = SAA7134_INPUT_COMPOSITE0,
2542 .vmux = 0, 2549 .vmux = 0,
2543 .amux = LINE1, 2550 .amux = LINE1,
2544 },{ 2551 },{
2545 .name = "Composite 1", 2552 .type = SAA7134_INPUT_COMPOSITE1,
2546 .vmux = 1, 2553 .vmux = 1,
2547 .amux = LINE2, 2554 .amux = LINE2,
2548 },{ 2555 },{
2549 .name = "Composite 2", 2556 .type = SAA7134_INPUT_COMPOSITE2,
2550 .vmux = 2, 2557 .vmux = 2,
2551 .amux = LINE1, 2558 .amux = LINE1,
2552 },{ 2559 },{
2553 .name = "Composite 3", 2560 .type = SAA7134_INPUT_COMPOSITE3,
2554 .vmux = 3, 2561 .vmux = 3,
2555 .amux = LINE2, 2562 .amux = LINE2,
2556 },{ 2563 },{
2557 .name = "S-Video 0", 2564 .type = SAA7134_INPUT_SVIDEO0,
2558 .vmux = 8, 2565 .vmux = 8,
2559 .amux = LINE1, 2566 .amux = LINE1,
2560 },{ 2567 },{
2561 .name = "S-Video 1", 2568 .type = SAA7134_INPUT_SVIDEO1,
2562 .vmux = 9, 2569 .vmux = 9,
2563 .amux = LINE2, 2570 .amux = LINE2,
2564 }}, 2571 }},
@@ -2572,20 +2579,20 @@ struct saa7134_board saa7134_boards[] = {
2572 .radio_addr = ADDR_UNSET, 2579 .radio_addr = ADDR_UNSET,
2573 2580
2574 .inputs = {{ 2581 .inputs = {{
2575 .name = name_tv, 2582 .type = SAA7134_INPUT_TV,
2576 .vmux = 1, 2583 .vmux = 1,
2577 .amux = TV, 2584 .amux = TV,
2578 .tv = 1, 2585 .tv = 1,
2579 },{ 2586 },{
2580 .name = name_comp1, /* Composite signal on S-Video input */ 2587 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
2581 .vmux = 0, 2588 .vmux = 0,
2582 .amux = LINE2, 2589 .amux = LINE2,
2583 },{ 2590 },{
2584 .name = name_comp2, /* Composite input */ 2591 .type = SAA7134_INPUT_COMPOSITE,
2585 .vmux = 3, 2592 .vmux = 3,
2586 .amux = LINE2, 2593 .amux = LINE2,
2587 },{ 2594 },{
2588 .name = name_svideo, 2595 .type = SAA7134_INPUT_SVIDEO,
2589 .vmux = 8, 2596 .vmux = 8,
2590 .amux = LINE2, 2597 .amux = LINE2,
2591 }}, 2598 }},
@@ -2604,11 +2611,11 @@ struct saa7134_board saa7134_boards[] = {
2604 .radio_addr = ADDR_UNSET, 2611 .radio_addr = ADDR_UNSET,
2605 .mpeg = SAA7134_MPEG_DVB, 2612 .mpeg = SAA7134_MPEG_DVB,
2606 .inputs = {{ 2613 .inputs = {{
2607 .name = name_comp1, 2614 .type = SAA7134_INPUT_COMPOSITE1,
2608 .vmux = 3, 2615 .vmux = 3,
2609 .amux = LINE2, 2616 .amux = LINE2,
2610 },{ 2617 },{
2611 .name = name_svideo, 2618 .type = SAA7134_INPUT_SVIDEO,
2612 .vmux = 8, 2619 .vmux = 8,
2613 .amux = LINE2, 2620 .amux = LINE2,
2614 }}, 2621 }},
@@ -2622,16 +2629,16 @@ struct saa7134_board saa7134_boards[] = {
2622 .radio_addr = ADDR_UNSET, 2629 .radio_addr = ADDR_UNSET,
2623 2630
2624 .inputs = {{ 2631 .inputs = {{
2625 .name = name_tv, 2632 .type = SAA7134_INPUT_TV,
2626 .vmux = 1, 2633 .vmux = 1,
2627 .amux = TV, 2634 .amux = TV,
2628 .tv = 1, 2635 .tv = 1,
2629 },{ 2636 },{
2630 .name = name_comp1, 2637 .type = SAA7134_INPUT_COMPOSITE1,
2631 .vmux = 3, 2638 .vmux = 3,
2632 .amux = LINE1, 2639 .amux = LINE1,
2633 },{ 2640 },{
2634 .name = name_svideo, 2641 .type = SAA7134_INPUT_SVIDEO,
2635 .vmux = 6, 2642 .vmux = 6,
2636 .amux = LINE1, 2643 .amux = LINE1,
2637 }}, 2644 }},
@@ -2645,25 +2652,25 @@ struct saa7134_board saa7134_boards[] = {
2645 .radio_addr = ADDR_UNSET, 2652 .radio_addr = ADDR_UNSET,
2646 .gpiomask = 0x080200000, 2653 .gpiomask = 0x080200000,
2647 .inputs = { { 2654 .inputs = { {
2648 .name = name_tv, 2655 .type = SAA7134_INPUT_TV,
2649 .vmux = 4, 2656 .vmux = 4,
2650 .amux = TV, 2657 .amux = TV,
2651 .tv = 1, 2658 .tv = 1,
2652 }, { 2659 }, {
2653 .name = name_comp1, 2660 .type = SAA7134_INPUT_COMPOSITE1,
2654 .vmux = 1, 2661 .vmux = 1,
2655 .amux = LINE2, 2662 .amux = LINE2,
2656 }, { 2663 }, {
2657 .name = name_comp2, 2664 .type = SAA7134_INPUT_COMPOSITE2,
2658 .vmux = 0, 2665 .vmux = 0,
2659 .amux = LINE2, 2666 .amux = LINE2,
2660 }, { 2667 }, {
2661 .name = name_svideo, 2668 .type = SAA7134_INPUT_SVIDEO,
2662 .vmux = 8, 2669 .vmux = 8,
2663 .amux = LINE2, 2670 .amux = LINE2,
2664 } }, 2671 } },
2665 .radio = { 2672 .radio = {
2666 .name = name_radio, 2673 .type = SAA7134_INPUT_RADIO,
2667 .amux = TV, 2674 .amux = TV,
2668 .gpio = 0x0200000, 2675 .gpio = 0x0200000,
2669 }, 2676 },
@@ -2678,29 +2685,29 @@ struct saa7134_board saa7134_boards[] = {
2678 .gpiomask = 1 << 21, 2685 .gpiomask = 1 << 21,
2679 .mpeg = SAA7134_MPEG_DVB, 2686 .mpeg = SAA7134_MPEG_DVB,
2680 .inputs = {{ 2687 .inputs = {{
2681 .name = name_tv, 2688 .type = SAA7134_INPUT_TV,
2682 .vmux = 1, 2689 .vmux = 1,
2683 .amux = TV, 2690 .amux = TV,
2684 .tv = 1, 2691 .tv = 1,
2685 .gpio = 0x0000000, 2692 .gpio = 0x0000000,
2686 },{ 2693 },{
2687 .name = name_comp1, 2694 .type = SAA7134_INPUT_COMPOSITE1,
2688 .vmux = 3, 2695 .vmux = 3,
2689 .amux = LINE2, 2696 .amux = LINE2,
2690 .gpio = 0x0200000, 2697 .gpio = 0x0200000,
2691 },{ 2698 },{
2692 .name = name_comp2, 2699 .type = SAA7134_INPUT_COMPOSITE2,
2693 .vmux = 0, 2700 .vmux = 0,
2694 .amux = LINE2, 2701 .amux = LINE2,
2695 .gpio = 0x0200000, 2702 .gpio = 0x0200000,
2696 },{ 2703 },{
2697 .name = name_svideo, 2704 .type = SAA7134_INPUT_SVIDEO,
2698 .vmux = 8, 2705 .vmux = 8,
2699 .amux = LINE2, 2706 .amux = LINE2,
2700 .gpio = 0x0200000, 2707 .gpio = 0x0200000,
2701 }}, 2708 }},
2702 .radio = { 2709 .radio = {
2703 .name = name_radio, 2710 .type = SAA7134_INPUT_RADIO,
2704 .amux = TV, 2711 .amux = TV,
2705 .gpio = 0x0200000, 2712 .gpio = 0x0200000,
2706 }, 2713 },
@@ -2717,21 +2724,21 @@ struct saa7134_board saa7134_boards[] = {
2717 .radio_addr = ADDR_UNSET, 2724 .radio_addr = ADDR_UNSET,
2718 .gpiomask = 0xe880c0, 2725 .gpiomask = 0xe880c0,
2719 .inputs = {{ 2726 .inputs = {{
2720 .name = name_tv, 2727 .type = SAA7134_INPUT_TV,
2721 .vmux = 3, 2728 .vmux = 3,
2722 .amux = TV, 2729 .amux = TV,
2723 .tv = 1, 2730 .tv = 1,
2724 },{ 2731 },{
2725 .name = name_comp1, 2732 .type = SAA7134_INPUT_COMPOSITE1,
2726 .vmux = 1, 2733 .vmux = 1,
2727 .amux = LINE1, 2734 .amux = LINE1,
2728 },{ 2735 },{
2729 .name = name_svideo, 2736 .type = SAA7134_INPUT_SVIDEO,
2730 .vmux = 6, 2737 .vmux = 6,
2731 .amux = LINE1, 2738 .amux = LINE1,
2732 }}, 2739 }},
2733 .radio = { 2740 .radio = {
2734 .name = name_radio, 2741 .type = SAA7134_INPUT_RADIO,
2735 .amux = LINE2, 2742 .amux = LINE2,
2736 }, 2743 },
2737 }, 2744 },
@@ -2745,16 +2752,16 @@ struct saa7134_board saa7134_boards[] = {
2745 .tuner_addr = ADDR_UNSET, 2752 .tuner_addr = ADDR_UNSET,
2746 .radio_addr = ADDR_UNSET, 2753 .radio_addr = ADDR_UNSET,
2747 .inputs = {{ 2754 .inputs = {{
2748 .name = name_tv, 2755 .type = SAA7134_INPUT_TV,
2749 .vmux = 1, 2756 .vmux = 1,
2750 .amux = TV, 2757 .amux = TV,
2751 .tv = 1, 2758 .tv = 1,
2752 },{ 2759 },{
2753 .name = name_comp1, 2760 .type = SAA7134_INPUT_COMPOSITE1,
2754 .vmux = 3, 2761 .vmux = 3,
2755 .amux = LINE1, 2762 .amux = LINE1,
2756 },{ 2763 },{
2757 .name = name_svideo, 2764 .type = SAA7134_INPUT_SVIDEO,
2758 .vmux = 8, 2765 .vmux = 8,
2759 .amux = LINE1, 2766 .amux = LINE1,
2760 }}, 2767 }},
@@ -2770,21 +2777,21 @@ struct saa7134_board saa7134_boards[] = {
2770 .mpeg = SAA7134_MPEG_DVB, 2777 .mpeg = SAA7134_MPEG_DVB,
2771 .gpiomask = 0x0200000, 2778 .gpiomask = 0x0200000,
2772 .inputs = {{ 2779 .inputs = {{
2773 .name = name_tv, 2780 .type = SAA7134_INPUT_TV,
2774 .vmux = 1, 2781 .vmux = 1,
2775 .amux = TV, 2782 .amux = TV,
2776 .tv = 1, 2783 .tv = 1,
2777 },{ 2784 },{
2778 .name = name_comp1, 2785 .type = SAA7134_INPUT_COMPOSITE1,
2779 .vmux = 3, 2786 .vmux = 3,
2780 .amux = LINE1, 2787 .amux = LINE1,
2781 },{ 2788 },{
2782 .name = name_svideo, 2789 .type = SAA7134_INPUT_SVIDEO,
2783 .vmux = 8, 2790 .vmux = 8,
2784 .amux = LINE1, 2791 .amux = LINE1,
2785 }}, 2792 }},
2786 .radio = { 2793 .radio = {
2787 .name = name_radio, 2794 .type = SAA7134_INPUT_RADIO,
2788 .amux = TV, 2795 .amux = TV,
2789 .gpio = 0x0200000, 2796 .gpio = 0x0200000,
2790 }, 2797 },
@@ -2798,25 +2805,25 @@ struct saa7134_board saa7134_boards[] = {
2798 .radio_addr = ADDR_UNSET, 2805 .radio_addr = ADDR_UNSET,
2799 .gpiomask = 1 << 21, 2806 .gpiomask = 1 << 21,
2800 .inputs = {{ 2807 .inputs = {{
2801 .name = name_tv, 2808 .type = SAA7134_INPUT_TV,
2802 .vmux = 1, 2809 .vmux = 1,
2803 .amux = TV, 2810 .amux = TV,
2804 .tv = 1, 2811 .tv = 1,
2805 },{ 2812 },{
2806 .name = name_comp1, 2813 .type = SAA7134_INPUT_COMPOSITE,
2807 .vmux = 3, 2814 .vmux = 3,
2808 .amux = LINE2, /* unconfirmed, taken from Philips driver */ 2815 .amux = LINE2, /* unconfirmed, taken from Philips driver */
2809 },{ 2816 },{
2810 .name = name_comp2, 2817 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
2811 .vmux = 0, /* untested, Composite over S-Video */ 2818 .vmux = 0, /* untested */
2812 .amux = LINE2, 2819 .amux = LINE2,
2813 },{ 2820 },{
2814 .name = name_svideo, 2821 .type = SAA7134_INPUT_SVIDEO,
2815 .vmux = 8, 2822 .vmux = 8,
2816 .amux = LINE2, 2823 .amux = LINE2,
2817 }}, 2824 }},
2818 .radio = { 2825 .radio = {
2819 .name = name_radio, 2826 .type = SAA7134_INPUT_RADIO,
2820 .amux = TV, 2827 .amux = TV,
2821 .gpio = 0x0200000, 2828 .gpio = 0x0200000,
2822 }, 2829 },
@@ -2834,17 +2841,17 @@ struct saa7134_board saa7134_boards[] = {
2834 .radio_addr = ADDR_UNSET, 2841 .radio_addr = ADDR_UNSET,
2835 .gpiomask = 0x80200000, 2842 .gpiomask = 0x80200000,
2836 .inputs = {{ 2843 .inputs = {{
2837 .name = name_tv, 2844 .type = SAA7134_INPUT_TV,
2838 .vmux = 1, 2845 .vmux = 1,
2839 .amux = TV, 2846 .amux = TV,
2840 .tv = 1, 2847 .tv = 1,
2841 },{ 2848 },{
2842 .name = name_svideo, /* NOT tested */ 2849 .type = SAA7134_INPUT_SVIDEO, /* NOT tested */
2843 .vmux = 8, 2850 .vmux = 8,
2844 .amux = LINE1, 2851 .amux = LINE1,
2845 }}, 2852 }},
2846 .radio = { 2853 .radio = {
2847 .name = name_radio, 2854 .type = SAA7134_INPUT_RADIO,
2848 .amux = TV, 2855 .amux = TV,
2849 .gpio = 0x0200000, 2856 .gpio = 0x0200000,
2850 }, 2857 },
@@ -2861,26 +2868,26 @@ struct saa7134_board saa7134_boards[] = {
2861 .gpiomask = 0x00200000, 2868 .gpiomask = 0x00200000,
2862 .mpeg = SAA7134_MPEG_DVB, 2869 .mpeg = SAA7134_MPEG_DVB,
2863 .inputs = {{ 2870 .inputs = {{
2864 .name = name_tv, /* Analog broadcast/cable TV */ 2871 .type = SAA7134_INPUT_TV, /* Analog broadcast/cable TV */
2865 .vmux = 1, 2872 .vmux = 1,
2866 .amux = TV, 2873 .amux = TV,
2867 .gpio = 0x200000, /* GPIO21=High for TV input */ 2874 .gpio = 0x200000, /* GPIO21=High for TV input */
2868 .tv = 1, 2875 .tv = 1,
2869 },{ 2876 },{
2870 .name = name_svideo, /* S-Video signal on S-Video input */ 2877 .type = SAA7134_INPUT_SVIDEO,
2871 .vmux = 8, 2878 .vmux = 8,
2872 .amux = LINE2, 2879 .amux = LINE2,
2873 },{ 2880 },{
2874 .name = name_comp1, /* Composite signal on S-Video input */ 2881 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
2875 .vmux = 0, 2882 .vmux = 0,
2876 .amux = LINE2, 2883 .amux = LINE2,
2877 },{ 2884 },{
2878 .name = name_comp2, /* Composite input */ 2885 .type = SAA7134_INPUT_COMPOSITE2,
2879 .vmux = 3, 2886 .vmux = 3,
2880 .amux = LINE2, 2887 .amux = LINE2,
2881 }}, 2888 }},
2882 .radio = { 2889 .radio = {
2883 .name = name_radio, 2890 .type = SAA7134_INPUT_RADIO,
2884 .amux = TV, 2891 .amux = TV,
2885 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */ 2892 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */
2886 }, 2893 },
@@ -2894,11 +2901,11 @@ struct saa7134_board saa7134_boards[] = {
2894 .radio_addr = ADDR_UNSET, 2901 .radio_addr = ADDR_UNSET,
2895 .mpeg = SAA7134_MPEG_DVB, 2902 .mpeg = SAA7134_MPEG_DVB,
2896 .inputs = {{ 2903 .inputs = {{
2897 .name = name_comp1, 2904 .type = SAA7134_INPUT_COMPOSITE1,
2898 .vmux = 1, 2905 .vmux = 1,
2899 .amux = LINE1, 2906 .amux = LINE1,
2900 },{ 2907 },{
2901 .name = name_svideo, 2908 .type = SAA7134_INPUT_SVIDEO,
2902 .vmux = 8, 2909 .vmux = 8,
2903 .amux = LINE1, 2910 .amux = LINE1,
2904 }}, 2911 }},
@@ -2914,11 +2921,11 @@ struct saa7134_board saa7134_boards[] = {
2914 .radio_addr = ADDR_UNSET, 2921 .radio_addr = ADDR_UNSET,
2915 .mpeg = SAA7134_MPEG_DVB, 2922 .mpeg = SAA7134_MPEG_DVB,
2916 .inputs = {{ 2923 .inputs = {{
2917 .name = name_comp1, /* Composite input */ 2924 .type = SAA7134_INPUT_COMPOSITE1,
2918 .vmux = 3, 2925 .vmux = 3,
2919 .amux = LINE2, 2926 .amux = LINE2,
2920 },{ 2927 },{
2921 .name = name_svideo, /* S-Video signal on S-Video input */ 2928 .type = SAA7134_INPUT_SVIDEO,
2922 .vmux = 8, 2929 .vmux = 8,
2923 .amux = LINE2, 2930 .amux = LINE2,
2924 }}, 2931 }},
@@ -2933,7 +2940,7 @@ struct saa7134_board saa7134_boards[] = {
2933 .mpeg = SAA7134_MPEG_DVB, 2940 .mpeg = SAA7134_MPEG_DVB,
2934 .gpiomask = 0x00600000, /* Bit 21 0=Radio, Bit 22 0=TV */ 2941 .gpiomask = 0x00600000, /* Bit 21 0=Radio, Bit 22 0=TV */
2935 .inputs = {{ 2942 .inputs = {{
2936 .name = name_tv, 2943 .type = SAA7134_INPUT_TV,
2937 .vmux = 1, 2944 .vmux = 1,
2938 .amux = TV, 2945 .amux = TV,
2939 .tv = 1, 2946 .tv = 1,
@@ -2950,25 +2957,25 @@ struct saa7134_board saa7134_boards[] = {
2950 .mpeg = SAA7134_MPEG_DVB, 2957 .mpeg = SAA7134_MPEG_DVB,
2951 .gpiomask = 1 << 21, 2958 .gpiomask = 1 << 21,
2952 .inputs = {{ 2959 .inputs = {{
2953 .name = name_tv, 2960 .type = SAA7134_INPUT_TV,
2954 .vmux = 1, 2961 .vmux = 1,
2955 .amux = TV, 2962 .amux = TV,
2956 .tv = 1, 2963 .tv = 1,
2957 },{ 2964 },{
2958 .name = name_comp1, 2965 .type = SAA7134_INPUT_COMPOSITE1,
2959 .vmux = 3, 2966 .vmux = 3,
2960 .amux = LINE1, 2967 .amux = LINE1,
2961 },{ 2968 },{
2962 .name = name_comp2, 2969 .type = SAA7134_INPUT_COMPOSITE2,
2963 .vmux = 0, 2970 .vmux = 0,
2964 .amux = LINE1, 2971 .amux = LINE1,
2965 },{ 2972 },{
2966 .name = name_svideo, 2973 .type = SAA7134_INPUT_SVIDEO,
2967 .vmux = 8, 2974 .vmux = 8,
2968 .amux = LINE1, 2975 .amux = LINE1,
2969 }}, 2976 }},
2970 .radio = { 2977 .radio = {
2971 .name = name_radio, 2978 .type = SAA7134_INPUT_RADIO,
2972 .amux = TV, 2979 .amux = TV,
2973 .gpio = 0x0200000, 2980 .gpio = 0x0200000,
2974 }, 2981 },
@@ -2983,21 +2990,21 @@ struct saa7134_board saa7134_boards[] = {
2983 .mpeg = SAA7134_MPEG_DVB, 2990 .mpeg = SAA7134_MPEG_DVB,
2984 .gpiomask = 1 << 21, 2991 .gpiomask = 1 << 21,
2985 .inputs = {{ 2992 .inputs = {{
2986 .name = name_tv, 2993 .type = SAA7134_INPUT_TV,
2987 .vmux = 1, 2994 .vmux = 1,
2988 .amux = TV, 2995 .amux = TV,
2989 .tv = 1, 2996 .tv = 1,
2990 },{ 2997 },{
2991 .name = name_comp1, 2998 .type = SAA7134_INPUT_COMPOSITE1,
2992 .vmux = 3, 2999 .vmux = 3,
2993 .amux = LINE1, 3000 .amux = LINE1,
2994 },{ 3001 },{
2995 .name = name_svideo, 3002 .type = SAA7134_INPUT_SVIDEO,
2996 .vmux = 8, 3003 .vmux = 8,
2997 .amux = LINE1, 3004 .amux = LINE1,
2998 }}, 3005 }},
2999 .radio = { 3006 .radio = {
3000 .name = name_radio, 3007 .type = SAA7134_INPUT_RADIO,
3001 .amux = TV, 3008 .amux = TV,
3002 .gpio = 0x0200000, 3009 .gpio = 0x0200000,
3003 }, 3010 },
@@ -3012,16 +3019,16 @@ struct saa7134_board saa7134_boards[] = {
3012 .tda9887_conf = TDA9887_PRESENT, 3019 .tda9887_conf = TDA9887_PRESENT,
3013 .mpeg = SAA7134_MPEG_DVB, 3020 .mpeg = SAA7134_MPEG_DVB,
3014 .inputs = {{ 3021 .inputs = {{
3015 .name = name_tv, 3022 .type = SAA7134_INPUT_TV,
3016 .vmux = 1, 3023 .vmux = 1,
3017 .amux = TV, 3024 .amux = TV,
3018 .tv = 1, 3025 .tv = 1,
3019 },{ 3026 },{
3020 .name = name_comp1, 3027 .type = SAA7134_INPUT_COMPOSITE1,
3021 .vmux = 3, 3028 .vmux = 3,
3022 .amux = LINE2, 3029 .amux = LINE2,
3023 },{ 3030 },{
3024 .name = name_svideo, 3031 .type = SAA7134_INPUT_SVIDEO,
3025 .vmux = 8, 3032 .vmux = 8,
3026 .amux = LINE2, 3033 .amux = LINE2,
3027 }}, 3034 }},
@@ -3052,17 +3059,17 @@ struct saa7134_board saa7134_boards[] = {
3052 .tda9887_conf = TDA9887_PRESENT, 3059 .tda9887_conf = TDA9887_PRESENT,
3053 .gpiomask = 0xca60000, 3060 .gpiomask = 0xca60000,
3054 .inputs = {{ 3061 .inputs = {{
3055 .name = name_tv, 3062 .type = SAA7134_INPUT_TV,
3056 .vmux = 4, 3063 .vmux = 4,
3057 .amux = TV, 3064 .amux = TV,
3058 .tv = 1, 3065 .tv = 1,
3059 .gpio = 0x04a61000, 3066 .gpio = 0x04a61000,
3060 },{ 3067 },{
3061 .name = name_comp2, /* Composite SVIDEO (B/W if signal is carried with SVIDEO) */ 3068 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
3062 .vmux = 1, 3069 .vmux = 1,
3063 .amux = LINE2, 3070 .amux = LINE2,
3064 },{ 3071 },{
3065 .name = name_svideo, 3072 .type = SAA7134_INPUT_SVIDEO,
3066 .vmux = 9, /* 9 is correct as S-VIDEO1 according to a169.inf! */ 3073 .vmux = 9, /* 9 is correct as S-VIDEO1 according to a169.inf! */
3067 .amux = LINE1, 3074 .amux = LINE1,
3068 }}, 3075 }},
@@ -3086,26 +3093,26 @@ struct saa7134_board saa7134_boards[] = {
3086 .mpeg = SAA7134_MPEG_DVB, 3093 .mpeg = SAA7134_MPEG_DVB,
3087 .gpiomask = 0x00600000, /* Bit 21 0=Radio, Bit 22 0=TV */ 3094 .gpiomask = 0x00600000, /* Bit 21 0=Radio, Bit 22 0=TV */
3088 .inputs = {{ 3095 .inputs = {{
3089 .name = name_tv, 3096 .type = SAA7134_INPUT_TV,
3090 .vmux = 1, 3097 .vmux = 1,
3091 .amux = TV, 3098 .amux = TV,
3092 .gpio = 0x200000, /* GPIO21=High for TV input */ 3099 .gpio = 0x200000, /* GPIO21=High for TV input */
3093 .tv = 1, 3100 .tv = 1,
3094 },{ 3101 },{
3095 .name = name_svideo, /* S-Video signal on S-Video input */ 3102 .type = SAA7134_INPUT_SVIDEO,
3096 .vmux = 8, 3103 .vmux = 8,
3097 .amux = LINE2, 3104 .amux = LINE2,
3098 },{ 3105 },{
3099 .name = name_comp1, /* Composite signal on S-Video input */ 3106 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
3100 .vmux = 0, 3107 .vmux = 0,
3101 .amux = LINE2, 3108 .amux = LINE2,
3102 },{ 3109 },{
3103 .name = name_comp2, /* Composite input */ 3110 .type = SAA7134_INPUT_COMPOSITE,
3104 .vmux = 3, 3111 .vmux = 3,
3105 .amux = LINE2, 3112 .amux = LINE2,
3106 }}, 3113 }},
3107 .radio = { 3114 .radio = {
3108 .name = name_radio, 3115 .type = SAA7134_INPUT_RADIO,
3109 .amux = TV, 3116 .amux = TV,
3110 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */ 3117 .gpio = 0x000000, /* GPIO21=Low for FM radio antenna */
3111 }, 3118 },
@@ -3121,40 +3128,40 @@ struct saa7134_board saa7134_boards[] = {
3121 3128
3122 .gpiomask = 0xe000, 3129 .gpiomask = 0xe000,
3123 .inputs = {{ 3130 .inputs = {{
3124 .name = name_tv, 3131 .type = SAA7134_INPUT_TV,
3125 .vmux = 1, 3132 .vmux = 1,
3126 .amux = TV, 3133 .amux = TV,
3127 .gpio = 0x8000, 3134 .gpio = 0x8000,
3128 .tv = 1, 3135 .tv = 1,
3129 },{ 3136 },{
3130 .name = name_tv_mono, 3137 .type = SAA7134_INPUT_TV_MONO,
3131 .vmux = 1, 3138 .vmux = 1,
3132 .amux = LINE2, 3139 .amux = LINE2,
3133 .gpio = 0x0000, 3140 .gpio = 0x0000,
3134 .tv = 1, 3141 .tv = 1,
3135 },{ 3142 },{
3136 .name = name_comp1, 3143 .type = SAA7134_INPUT_COMPOSITE1,
3137 .vmux = 0, 3144 .vmux = 0,
3138 .amux = LINE2, 3145 .amux = LINE2,
3139 .gpio = 0x4000, 3146 .gpio = 0x4000,
3140 },{ 3147 },{
3141 .name = name_comp2, 3148 .type = SAA7134_INPUT_COMPOSITE2,
3142 .vmux = 3, 3149 .vmux = 3,
3143 .amux = LINE2, 3150 .amux = LINE2,
3144 .gpio = 0x4000, 3151 .gpio = 0x4000,
3145 },{ 3152 },{
3146 .name = name_svideo, 3153 .type = SAA7134_INPUT_SVIDEO,
3147 .vmux = 8, 3154 .vmux = 8,
3148 .amux = LINE2, 3155 .amux = LINE2,
3149 .gpio = 0x4000, 3156 .gpio = 0x4000,
3150 }}, 3157 }},
3151 .radio = { 3158 .radio = {
3152 .name = name_radio, 3159 .type = SAA7134_INPUT_RADIO,
3153 .amux = LINE2, 3160 .amux = LINE2,
3154 .gpio = 0x2000, 3161 .gpio = 0x2000,
3155 }, 3162 },
3156 .mute = { 3163 .mute = {
3157 .name = name_mute, 3164 .type = SAA7134_INPUT_MUTE,
3158 .amux = TV, 3165 .amux = TV,
3159 .gpio = 0x8000, 3166 .gpio = 0x8000,
3160 }, 3167 },
@@ -3168,16 +3175,16 @@ struct saa7134_board saa7134_boards[] = {
3168 .radio_addr = ADDR_UNSET, 3175 .radio_addr = ADDR_UNSET,
3169 .mpeg = SAA7134_MPEG_DVB, 3176 .mpeg = SAA7134_MPEG_DVB,
3170 .inputs = {{ 3177 .inputs = {{
3171 .name = name_tv, 3178 .type = SAA7134_INPUT_TV,
3172 .vmux = 1, 3179 .vmux = 1,
3173 .amux = TV, 3180 .amux = TV,
3174 .tv = 1, 3181 .tv = 1,
3175 },{ 3182 },{
3176 .name = name_comp1, 3183 .type = SAA7134_INPUT_COMPOSITE1,
3177 .vmux = 0, 3184 .vmux = 0,
3178 .amux = LINE1, 3185 .amux = LINE1,
3179 },{ 3186 },{
3180 .name = name_svideo, 3187 .type = SAA7134_INPUT_SVIDEO,
3181 .vmux = 8, 3188 .vmux = 8,
3182 .amux = LINE1, 3189 .amux = LINE1,
3183 }}, 3190 }},
@@ -3193,11 +3200,11 @@ struct saa7134_board saa7134_boards[] = {
3193 .radio_addr = ADDR_UNSET, 3200 .radio_addr = ADDR_UNSET,
3194 .mpeg = SAA7134_MPEG_DVB, 3201 .mpeg = SAA7134_MPEG_DVB,
3195 .inputs = {{ 3202 .inputs = {{
3196 .name = name_comp1, /* Composite input */ 3203 .type = SAA7134_INPUT_COMPOSITE1,
3197 .vmux = 3, 3204 .vmux = 3,
3198 .amux = LINE1, 3205 .amux = LINE1,
3199 },{ 3206 },{
3200 .name = name_svideo, /* S-Video signal on S-Video input */ 3207 .type = SAA7134_INPUT_SVIDEO,
3201 .vmux = 8, 3208 .vmux = 8,
3202 .amux = LINE1, 3209 .amux = LINE1,
3203 }}, 3210 }},
@@ -3211,25 +3218,25 @@ struct saa7134_board saa7134_boards[] = {
3211 .radio_addr = ADDR_UNSET, 3218 .radio_addr = ADDR_UNSET,
3212 .tda9887_conf = TDA9887_PRESENT, 3219 .tda9887_conf = TDA9887_PRESENT,
3213 .inputs = {{ 3220 .inputs = {{
3214 .name = name_tv, 3221 .type = SAA7134_INPUT_TV,
3215 .vmux = 1, 3222 .vmux = 1,
3216 .amux = LINE2, 3223 .amux = LINE2,
3217 .tv = 1, 3224 .tv = 1,
3218 },{ 3225 },{
3219 .name = name_comp1, 3226 .type = SAA7134_INPUT_COMPOSITE1,
3220 .vmux = 0, 3227 .vmux = 0,
3221 .amux = LINE2, 3228 .amux = LINE2,
3222 },{ 3229 },{
3223 .name = name_comp2, 3230 .type = SAA7134_INPUT_COMPOSITE2,
3224 .vmux = 3, 3231 .vmux = 3,
3225 .amux = LINE2, 3232 .amux = LINE2,
3226 },{ 3233 },{
3227 .name = name_svideo, 3234 .type = SAA7134_INPUT_SVIDEO,
3228 .vmux = 8, 3235 .vmux = 8,
3229 .amux = LINE2, 3236 .amux = LINE2,
3230 }}, 3237 }},
3231 .mute = { 3238 .mute = {
3232 .name = name_mute, 3239 .type = SAA7134_INPUT_MUTE,
3233 .amux = LINE1, 3240 .amux = LINE1,
3234 }, 3241 },
3235 }, 3242 },
@@ -3244,21 +3251,21 @@ struct saa7134_board saa7134_boards[] = {
3244 .tda9887_conf = TDA9887_PRESENT, 3251 .tda9887_conf = TDA9887_PRESENT,
3245 .mpeg = SAA7134_MPEG_DVB, 3252 .mpeg = SAA7134_MPEG_DVB,
3246 .inputs = {{ 3253 .inputs = {{
3247 .name = name_tv, 3254 .type = SAA7134_INPUT_TV,
3248 .vmux = 1, 3255 .vmux = 1,
3249 .amux = TV, 3256 .amux = TV,
3250 .tv = 1, 3257 .tv = 1,
3251 },{ 3258 },{
3252 .name = name_comp1, 3259 .type = SAA7134_INPUT_COMPOSITE1,
3253 .vmux = 3, 3260 .vmux = 3,
3254 .amux = LINE2, 3261 .amux = LINE2,
3255 },{ 3262 },{
3256 .name = name_svideo, 3263 .type = SAA7134_INPUT_SVIDEO,
3257 .vmux = 8, 3264 .vmux = 8,
3258 .amux = LINE1, 3265 .amux = LINE1,
3259 }}, 3266 }},
3260 .radio = { 3267 .radio = {
3261 .name = name_radio, 3268 .type = SAA7134_INPUT_RADIO,
3262 .amux = LINE1, 3269 .amux = LINE1,
3263 }, 3270 },
3264 }, 3271 },
@@ -3272,21 +3279,21 @@ struct saa7134_board saa7134_boards[] = {
3272 .tda9887_conf = TDA9887_PRESENT| TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE, 3279 .tda9887_conf = TDA9887_PRESENT| TDA9887_PORT1_ACTIVE | TDA9887_PORT2_ACTIVE,
3273 .mpeg = SAA7134_MPEG_DVB, 3280 .mpeg = SAA7134_MPEG_DVB,
3274 .inputs = {{ 3281 .inputs = {{
3275 .name = name_tv, 3282 .type = SAA7134_INPUT_TV,
3276 .vmux = 3, 3283 .vmux = 3,
3277 .amux = TV, 3284 .amux = TV,
3278 .tv = 1, 3285 .tv = 1,
3279 },{ 3286 },{
3280 .name = name_comp1, 3287 .type = SAA7134_INPUT_COMPOSITE1,
3281 .vmux = 4, 3288 .vmux = 4,
3282 .amux = LINE2, 3289 .amux = LINE2,
3283 },{ 3290 },{
3284 .name = name_svideo, 3291 .type = SAA7134_INPUT_SVIDEO,
3285 .vmux = 8, 3292 .vmux = 8,
3286 .amux = LINE2, 3293 .amux = LINE2,
3287 }}, 3294 }},
3288 .radio = { 3295 .radio = {
3289 .name = name_radio, 3296 .type = SAA7134_INPUT_RADIO,
3290 .amux = LINE1, 3297 .amux = LINE1,
3291 }, 3298 },
3292 }, 3299 },
@@ -3301,25 +3308,25 @@ struct saa7134_board saa7134_boards[] = {
3301 .mpeg = SAA7134_MPEG_DVB, 3308 .mpeg = SAA7134_MPEG_DVB,
3302 .gpiomask = 0x000200000, 3309 .gpiomask = 0x000200000,
3303 .inputs = {{ 3310 .inputs = {{
3304 .name = name_tv, 3311 .type = SAA7134_INPUT_TV,
3305 .vmux = 4, 3312 .vmux = 4,
3306 .amux = TV, 3313 .amux = TV,
3307 .tv = 1, 3314 .tv = 1,
3308 },{ 3315 },{
3309 .name = name_comp1, 3316 .type = SAA7134_INPUT_COMPOSITE1,
3310 .vmux = 1, 3317 .vmux = 1,
3311 .amux = LINE2, 3318 .amux = LINE2,
3312 },{ 3319 },{
3313 .name = name_comp2, 3320 .type = SAA7134_INPUT_COMPOSITE2,
3314 .vmux = 0, 3321 .vmux = 0,
3315 .amux = LINE2, 3322 .amux = LINE2,
3316 },{ 3323 },{
3317 .name = name_svideo, 3324 .type = SAA7134_INPUT_SVIDEO,
3318 .vmux = 8, 3325 .vmux = 8,
3319 .amux = LINE2, 3326 .amux = LINE2,
3320 }}, 3327 }},
3321 .radio = { 3328 .radio = {
3322 .name = name_radio, 3329 .type = SAA7134_INPUT_RADIO,
3323 .amux = TV, 3330 .amux = TV,
3324 .gpio = 0x0200000, 3331 .gpio = 0x0200000,
3325 }, 3332 },
@@ -3335,34 +3342,34 @@ struct saa7134_board saa7134_boards[] = {
3335 .tda9887_conf = TDA9887_PRESENT, 3342 .tda9887_conf = TDA9887_PRESENT,
3336 .gpiomask = 0x03, 3343 .gpiomask = 0x03,
3337 .inputs = {{ 3344 .inputs = {{
3338 .name = name_tv, 3345 .type = SAA7134_INPUT_TV,
3339 .vmux = 1, 3346 .vmux = 1,
3340 .amux = TV, 3347 .amux = TV,
3341 .tv = 1, 3348 .tv = 1,
3342 .gpio = 0x00, 3349 .gpio = 0x00,
3343 },{ 3350 },{
3344 .name = name_comp1, 3351 .type = SAA7134_INPUT_COMPOSITE1,
3345 .vmux = 0, 3352 .vmux = 0,
3346 .amux = LINE2, 3353 .amux = LINE2,
3347 .gpio = 0x00, 3354 .gpio = 0x00,
3348 },{ 3355 },{
3349 .name = name_comp2, 3356 .type = SAA7134_INPUT_COMPOSITE2,
3350 .vmux = 3, 3357 .vmux = 3,
3351 .amux = LINE2, 3358 .amux = LINE2,
3352 .gpio = 0x00, 3359 .gpio = 0x00,
3353 },{ 3360 },{
3354 .name = name_svideo, 3361 .type = SAA7134_INPUT_SVIDEO,
3355 .vmux = 8, 3362 .vmux = 8,
3356 .amux = LINE2, 3363 .amux = LINE2,
3357 .gpio = 0x00, 3364 .gpio = 0x00,
3358 }}, 3365 }},
3359 .radio = { 3366 .radio = {
3360 .name = name_radio, 3367 .type = SAA7134_INPUT_RADIO,
3361 .amux = LINE2, 3368 .amux = LINE2,
3362 .gpio = 0x01, 3369 .gpio = 0x01,
3363 }, 3370 },
3364 .mute = { 3371 .mute = {
3365 .name = name_mute, 3372 .type = SAA7134_INPUT_MUTE,
3366 .amux = LINE1, 3373 .amux = LINE1,
3367 .gpio = 0x00, 3374 .gpio = 0x00,
3368 }, 3375 },
@@ -3378,16 +3385,16 @@ struct saa7134_board saa7134_boards[] = {
3378 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, 3385 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
3379 .mpeg = SAA7134_MPEG_DVB, 3386 .mpeg = SAA7134_MPEG_DVB,
3380 .inputs = {{ 3387 .inputs = {{
3381 .name = name_tv, 3388 .type = SAA7134_INPUT_TV,
3382 .vmux = 3, 3389 .vmux = 3,
3383 .amux = TV, 3390 .amux = TV,
3384 .tv = 1, 3391 .tv = 1,
3385 },{ 3392 },{
3386 .name = name_comp1, 3393 .type = SAA7134_INPUT_COMPOSITE1,
3387 .vmux = 1, 3394 .vmux = 1,
3388 .amux = LINE2, 3395 .amux = LINE2,
3389 },{ 3396 },{
3390 .name = name_svideo, 3397 .type = SAA7134_INPUT_SVIDEO,
3391 .vmux = 8, 3398 .vmux = 8,
3392 .amux = LINE2, 3399 .amux = LINE2,
3393 }}, 3400 }},
@@ -3405,22 +3412,22 @@ struct saa7134_board saa7134_boards[] = {
3405 .mpeg = SAA7134_MPEG_DVB, 3412 .mpeg = SAA7134_MPEG_DVB,
3406 .gpiomask = 0x0200100, 3413 .gpiomask = 0x0200100,
3407 .inputs = {{ 3414 .inputs = {{
3408 .name = name_tv, 3415 .type = SAA7134_INPUT_TV,
3409 .vmux = 1, 3416 .vmux = 1,
3410 .amux = TV, 3417 .amux = TV,
3411 .tv = 1, 3418 .tv = 1,
3412 .gpio = 0x0000100, 3419 .gpio = 0x0000100,
3413 }, { 3420 }, {
3414 .name = name_comp1, 3421 .type = SAA7134_INPUT_COMPOSITE1,
3415 .vmux = 3, 3422 .vmux = 3,
3416 .amux = LINE1, 3423 .amux = LINE1,
3417 }, { 3424 }, {
3418 .name = name_svideo, 3425 .type = SAA7134_INPUT_SVIDEO,
3419 .vmux = 8, 3426 .vmux = 8,
3420 .amux = LINE1, 3427 .amux = LINE1,
3421 } }, 3428 } },
3422 .radio = { 3429 .radio = {
3423 .name = name_radio, 3430 .type = SAA7134_INPUT_RADIO,
3424 .amux = TV, 3431 .amux = TV,
3425 .gpio = 0x0200100, 3432 .gpio = 0x0200100,
3426 }, 3433 },
@@ -3438,22 +3445,22 @@ struct saa7134_board saa7134_boards[] = {
3438 .ts_force_val = 1, 3445 .ts_force_val = 1,
3439 .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */ 3446 .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */
3440 .inputs = {{ 3447 .inputs = {{
3441 .name = name_tv, 3448 .type = SAA7134_INPUT_TV,
3442 .vmux = 1, 3449 .vmux = 1,
3443 .amux = TV, 3450 .amux = TV,
3444 .tv = 1, 3451 .tv = 1,
3445 .gpio = 0x0000100, 3452 .gpio = 0x0000100,
3446 }, { 3453 }, {
3447 .name = name_comp1, 3454 .type = SAA7134_INPUT_COMPOSITE1,
3448 .vmux = 3, 3455 .vmux = 3,
3449 .amux = LINE1, 3456 .amux = LINE1,
3450 }, { 3457 }, {
3451 .name = name_svideo, 3458 .type = SAA7134_INPUT_SVIDEO,
3452 .vmux = 8, 3459 .vmux = 8,
3453 .amux = LINE1, 3460 .amux = LINE1,
3454 } }, 3461 } },
3455 .radio = { 3462 .radio = {
3456 .name = name_radio, 3463 .type = SAA7134_INPUT_RADIO,
3457 .amux = TV, 3464 .amux = TV,
3458 .gpio = 0x0800100, /* GPIO 23 HI for FM */ 3465 .gpio = 0x0800100, /* GPIO 23 HI for FM */
3459 }, 3466 },
@@ -3470,22 +3477,22 @@ struct saa7134_board saa7134_boards[] = {
3470 .ts_type = SAA7134_MPEG_TS_SERIAL, 3477 .ts_type = SAA7134_MPEG_TS_SERIAL,
3471 .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */ 3478 .gpiomask = 0x0800100, /* GPIO 21 is an INPUT */
3472 .inputs = {{ 3479 .inputs = {{
3473 .name = name_tv, 3480 .type = SAA7134_INPUT_TV,
3474 .vmux = 1, 3481 .vmux = 1,
3475 .amux = TV, 3482 .amux = TV,
3476 .tv = 1, 3483 .tv = 1,
3477 .gpio = 0x0000100, 3484 .gpio = 0x0000100,
3478 }, { 3485 }, {
3479 .name = name_comp1, 3486 .type = SAA7134_INPUT_COMPOSITE1,
3480 .vmux = 3, 3487 .vmux = 3,
3481 .amux = LINE1, 3488 .amux = LINE1,
3482 }, { 3489 }, {
3483 .name = name_svideo, 3490 .type = SAA7134_INPUT_SVIDEO,
3484 .vmux = 8, 3491 .vmux = 8,
3485 .amux = LINE1, 3492 .amux = LINE1,
3486 } }, 3493 } },
3487 .radio = { 3494 .radio = {
3488 .name = name_radio, 3495 .type = SAA7134_INPUT_RADIO,
3489 .amux = TV, 3496 .amux = TV,
3490 .gpio = 0x0800100, /* GPIO 23 HI for FM */ 3497 .gpio = 0x0800100, /* GPIO 23 HI for FM */
3491 }, 3498 },
@@ -3499,16 +3506,16 @@ struct saa7134_board saa7134_boards[] = {
3499 .radio_addr = ADDR_UNSET, 3506 .radio_addr = ADDR_UNSET,
3500 .mpeg = SAA7134_MPEG_DVB, 3507 .mpeg = SAA7134_MPEG_DVB,
3501 .inputs = {{ 3508 .inputs = {{
3502 .name = name_tv, 3509 .type = SAA7134_INPUT_TV,
3503 .vmux = 1, 3510 .vmux = 1,
3504 .amux = TV, 3511 .amux = TV,
3505 .tv = 1, 3512 .tv = 1,
3506 },{ 3513 },{
3507 .name = name_comp1, 3514 .type = SAA7134_INPUT_COMPOSITE1,
3508 .vmux = 0, 3515 .vmux = 0,
3509 .amux = LINE1, 3516 .amux = LINE1,
3510 },{ 3517 },{
3511 .name = name_svideo, 3518 .type = SAA7134_INPUT_SVIDEO,
3512 .vmux = 6, 3519 .vmux = 6,
3513 .amux = LINE1, 3520 .amux = LINE1,
3514 }}, 3521 }},
@@ -3523,33 +3530,33 @@ struct saa7134_board saa7134_boards[] = {
3523 .tuner_addr = ADDR_UNSET, 3530 .tuner_addr = ADDR_UNSET,
3524 .radio_addr = ADDR_UNSET, 3531 .radio_addr = ADDR_UNSET,
3525 .inputs = {{ 3532 .inputs = {{
3526 .name = name_tv, 3533 .type = SAA7134_INPUT_TV,
3527 .vmux = 1, 3534 .vmux = 1,
3528 .amux = 3, 3535 .amux = 3,
3529 .tv = 1, 3536 .tv = 1,
3530 },{ 3537 },{
3531 .name = name_tv_mono, 3538 .type = SAA7134_INPUT_TV_MONO,
3532 .vmux = 7, 3539 .vmux = 7,
3533 .amux = 4, 3540 .amux = 4,
3534 .tv = 1, 3541 .tv = 1,
3535 },{ 3542 },{
3536 .name = name_comp1, 3543 .type = SAA7134_INPUT_COMPOSITE1,
3537 .vmux = 3, 3544 .vmux = 3,
3538 .amux = 2, 3545 .amux = 2,
3539 },{ 3546 },{
3540 .name = name_svideo, 3547 .type = SAA7134_INPUT_SVIDEO,
3541 .vmux = 0, 3548 .vmux = 0,
3542 .amux = 2, 3549 .amux = 2,
3543 }}, 3550 }},
3544 .radio = { 3551 .radio = {
3545 .name = name_radio, 3552 .type = SAA7134_INPUT_RADIO,
3546 .amux = LINE2, 3553 .amux = LINE2,
3547/* .gpio = 0x00300001,*/ 3554/* .gpio = 0x00300001,*/
3548 .gpio = 0x20000, 3555 .gpio = 0x20000,
3549 3556
3550 }, 3557 },
3551 .mute = { 3558 .mute = {
3552 .name = name_mute, 3559 .type = SAA7134_INPUT_MUTE,
3553 .amux = 0, 3560 .amux = 0,
3554 }, 3561 },
3555 }, 3562 },
@@ -3562,32 +3569,32 @@ struct saa7134_board saa7134_boards[] = {
3562 .tuner_addr = ADDR_UNSET, 3569 .tuner_addr = ADDR_UNSET,
3563 .radio_addr = ADDR_UNSET, 3570 .radio_addr = ADDR_UNSET,
3564 .inputs = {{ 3571 .inputs = {{
3565 .name = name_tv, 3572 .type = SAA7134_INPUT_TV,
3566 .vmux = 1, 3573 .vmux = 1,
3567 .amux = 3, 3574 .amux = 3,
3568 .tv = 1, 3575 .tv = 1,
3569 },{ 3576 },{
3570 .name = name_tv_mono, 3577 .type = SAA7134_INPUT_TV_MONO,
3571 .vmux = 7, 3578 .vmux = 7,
3572 .amux = 4, 3579 .amux = 4,
3573 .tv = 1, 3580 .tv = 1,
3574 },{ 3581 },{
3575 .name = name_comp1, 3582 .type = SAA7134_INPUT_COMPOSITE1,
3576 .vmux = 3, 3583 .vmux = 3,
3577 .amux = 2, 3584 .amux = 2,
3578 },{ 3585 },{
3579 .name = name_svideo, 3586 .type = SAA7134_INPUT_SVIDEO,
3580 .vmux = 0, 3587 .vmux = 0,
3581 .amux = 2, 3588 .amux = 2,
3582 }}, 3589 }},
3583 .radio = { 3590 .radio = {
3584 .name = name_radio, 3591 .type = SAA7134_INPUT_RADIO,
3585 .amux = LINE2, 3592 .amux = LINE2,
3586 .gpio = 0x20000, 3593 .gpio = 0x20000,
3587 3594
3588 }, 3595 },
3589 .mute = { 3596 .mute = {
3590 .name = name_mute, 3597 .type = SAA7134_INPUT_MUTE,
3591 .amux = 0, 3598 .amux = 0,
3592 }, 3599 },
3593 }, 3600 },
@@ -3600,29 +3607,29 @@ struct saa7134_board saa7134_boards[] = {
3600 .radio_addr = ADDR_UNSET, 3607 .radio_addr = ADDR_UNSET,
3601 .gpiomask = 0x7000, 3608 .gpiomask = 0x7000,
3602 .inputs = { { 3609 .inputs = { {
3603 .name = name_tv, 3610 .type = SAA7134_INPUT_TV,
3604 .vmux = 1, 3611 .vmux = 1,
3605 .amux = 1, 3612 .amux = 1,
3606 .tv = 1, 3613 .tv = 1,
3607 .gpio = 0x50000, 3614 .gpio = 0x50000,
3608 }, { 3615 }, {
3609 .name = name_comp1, 3616 .type = SAA7134_INPUT_COMPOSITE1,
3610 .vmux = 3, 3617 .vmux = 3,
3611 .amux = 2, 3618 .amux = 2,
3612 .gpio = 0x2000, 3619 .gpio = 0x2000,
3613 }, { 3620 }, {
3614 .name = name_svideo, 3621 .type = SAA7134_INPUT_SVIDEO,
3615 .vmux = 8, 3622 .vmux = 8,
3616 .amux = 2, 3623 .amux = 2,
3617 .gpio = 0x2000, 3624 .gpio = 0x2000,
3618 } }, 3625 } },
3619 .radio = { 3626 .radio = {
3620 .name = name_radio, 3627 .type = SAA7134_INPUT_RADIO,
3621 .vmux = 1, 3628 .vmux = 1,
3622 .amux = 1, 3629 .amux = 1,
3623 }, 3630 },
3624 .mute = { 3631 .mute = {
3625 .name = name_mute, 3632 .type = SAA7134_INPUT_MUTE,
3626 .gpio = 0xf000, 3633 .gpio = 0xf000,
3627 .amux = 0, 3634 .amux = 0,
3628 }, 3635 },
@@ -3635,26 +3642,26 @@ struct saa7134_board saa7134_boards[] = {
3635 .tuner_addr = 0x61, 3642 .tuner_addr = 0x61,
3636 .radio_addr = 0x60, 3643 .radio_addr = 0x60,
3637 .inputs = { { 3644 .inputs = { {
3638 .name = name_tv, 3645 .type = SAA7134_INPUT_TV,
3639 .vmux = 1, 3646 .vmux = 1,
3640 .amux = LINE2, 3647 .amux = LINE2,
3641 .tv = 1, 3648 .tv = 1,
3642 }, { 3649 }, {
3643 .name = name_comp1, 3650 .type = SAA7134_INPUT_COMPOSITE1,
3644 .vmux = 3, 3651 .vmux = 3,
3645 .amux = LINE1, 3652 .amux = LINE1,
3646 }, { 3653 }, {
3647 .name = name_svideo, 3654 .type = SAA7134_INPUT_SVIDEO,
3648 .vmux = 8, 3655 .vmux = 8,
3649 .amux = LINE1, 3656 .amux = LINE1,
3650 } }, 3657 } },
3651 .radio = { 3658 .radio = {
3652 .name = name_radio, 3659 .type = SAA7134_INPUT_RADIO,
3653 .vmux = 1, 3660 .vmux = 1,
3654 .amux = LINE1, 3661 .amux = LINE1,
3655 }, 3662 },
3656 .mute = { 3663 .mute = {
3657 .name = name_mute, 3664 .type = SAA7134_INPUT_MUTE,
3658 .amux = LINE1, 3665 .amux = LINE1,
3659 .gpio = 0x43000, 3666 .gpio = 0x43000,
3660 }, 3667 },
@@ -3668,16 +3675,16 @@ struct saa7134_board saa7134_boards[] = {
3668 .radio_addr = ADDR_UNSET, 3675 .radio_addr = ADDR_UNSET,
3669 .mpeg = SAA7134_MPEG_DVB, 3676 .mpeg = SAA7134_MPEG_DVB,
3670 .inputs = {{ 3677 .inputs = {{
3671 .name = name_tv, 3678 .type = SAA7134_INPUT_TV,
3672 .vmux = 1, 3679 .vmux = 1,
3673 .amux = TV, 3680 .amux = TV,
3674 .tv = 1, 3681 .tv = 1,
3675 },{ 3682 },{
3676 .name = name_comp1, 3683 .type = SAA7134_INPUT_COMPOSITE1,
3677 .vmux = 0, 3684 .vmux = 0,
3678 .amux = LINE1, 3685 .amux = LINE1,
3679 },{ 3686 },{
3680 .name = name_svideo, 3687 .type = SAA7134_INPUT_SVIDEO,
3681 .vmux = 6, 3688 .vmux = 6,
3682 .amux = LINE1, 3689 .amux = LINE1,
3683 }}, 3690 }},
@@ -3693,21 +3700,21 @@ struct saa7134_board saa7134_boards[] = {
3693 .mpeg = SAA7134_MPEG_DVB, 3700 .mpeg = SAA7134_MPEG_DVB,
3694 .gpiomask = 0x0200000, 3701 .gpiomask = 0x0200000,
3695 .inputs = {{ 3702 .inputs = {{
3696 .name = name_tv, 3703 .type = SAA7134_INPUT_TV,
3697 .vmux = 1, 3704 .vmux = 1,
3698 .amux = TV, 3705 .amux = TV,
3699 .tv = 1, 3706 .tv = 1,
3700 },{ 3707 },{
3701 .name = name_comp1, 3708 .type = SAA7134_INPUT_COMPOSITE1,
3702 .vmux = 3, 3709 .vmux = 3,
3703 .amux = LINE1, 3710 .amux = LINE1,
3704 },{ 3711 },{
3705 .name = name_svideo, 3712 .type = SAA7134_INPUT_SVIDEO,
3706 .vmux = 8, 3713 .vmux = 8,
3707 .amux = LINE1, 3714 .amux = LINE1,
3708 }}, 3715 }},
3709 .radio = { 3716 .radio = {
3710 .name = name_radio, 3717 .type = SAA7134_INPUT_RADIO,
3711 .amux = TV, 3718 .amux = TV,
3712 .gpio = 0x0200000, 3719 .gpio = 0x0200000,
3713 }, 3720 },
@@ -3721,16 +3728,16 @@ struct saa7134_board saa7134_boards[] = {
3721 .radio_addr = ADDR_UNSET, 3728 .radio_addr = ADDR_UNSET,
3722 .gpiomask = 1<<21, 3729 .gpiomask = 1<<21,
3723 .inputs = {{ 3730 .inputs = {{
3724 .name = name_tv, 3731 .type = SAA7134_INPUT_TV,
3725 .vmux = 1, 3732 .vmux = 1,
3726 .amux = TV, 3733 .amux = TV,
3727 .tv = 1, 3734 .tv = 1,
3728 },{ 3735 },{
3729 .name = name_comp1, 3736 .type = SAA7134_INPUT_COMPOSITE1,
3730 .vmux = 0, 3737 .vmux = 0,
3731 .amux = LINE2, 3738 .amux = LINE2,
3732 },{ 3739 },{
3733 .name = name_svideo, 3740 .type = SAA7134_INPUT_SVIDEO,
3734 .vmux = 6, 3741 .vmux = 6,
3735 .amux = LINE2, 3742 .amux = LINE2,
3736 }}, 3743 }},
@@ -3746,7 +3753,7 @@ struct saa7134_board saa7134_boards[] = {
3746 .mpeg = SAA7134_MPEG_DVB, 3753 .mpeg = SAA7134_MPEG_DVB,
3747 .gpiomask = 0x0200000, 3754 .gpiomask = 0x0200000,
3748 .inputs = {{ 3755 .inputs = {{
3749 .name = name_tv, 3756 .type = SAA7134_INPUT_TV,
3750 .vmux = 1, 3757 .vmux = 1,
3751 .amux = TV, 3758 .amux = TV,
3752 .tv = 1, 3759 .tv = 1,
@@ -3764,29 +3771,29 @@ struct saa7134_board saa7134_boards[] = {
3764 .gpiomask = 1 << 21, 3771 .gpiomask = 1 << 21,
3765 .mpeg = SAA7134_MPEG_DVB, 3772 .mpeg = SAA7134_MPEG_DVB,
3766 .inputs = {{ 3773 .inputs = {{
3767 .name = name_tv, 3774 .type = SAA7134_INPUT_TV,
3768 .vmux = 1, 3775 .vmux = 1,
3769 .amux = TV, 3776 .amux = TV,
3770 .tv = 1, 3777 .tv = 1,
3771 .gpio = 0x0000000, 3778 .gpio = 0x0000000,
3772 },{ 3779 },{
3773 .name = name_comp1, 3780 .type = SAA7134_INPUT_COMPOSITE1,
3774 .vmux = 3, 3781 .vmux = 3,
3775 .amux = LINE2, 3782 .amux = LINE2,
3776 .gpio = 0x0200000, 3783 .gpio = 0x0200000,
3777 },{ 3784 },{
3778 .name = name_comp2, 3785 .type = SAA7134_INPUT_COMPOSITE2,
3779 .vmux = 0, 3786 .vmux = 0,
3780 .amux = LINE2, 3787 .amux = LINE2,
3781 .gpio = 0x0200000, 3788 .gpio = 0x0200000,
3782 },{ 3789 },{
3783 .name = name_svideo, 3790 .type = SAA7134_INPUT_SVIDEO,
3784 .vmux = 8, 3791 .vmux = 8,
3785 .amux = LINE2, 3792 .amux = LINE2,
3786 .gpio = 0x0200000, 3793 .gpio = 0x0200000,
3787 }}, 3794 }},
3788 .radio = { 3795 .radio = {
3789 .name = name_radio, 3796 .type = SAA7134_INPUT_RADIO,
3790 .amux = TV, 3797 .amux = TV,
3791 .gpio = 0x0200000, 3798 .gpio = 0x0200000,
3792 }, 3799 },
@@ -3800,26 +3807,26 @@ struct saa7134_board saa7134_boards[] = {
3800 .radio_addr = ADDR_UNSET, 3807 .radio_addr = ADDR_UNSET,
3801 .gpiomask = 1 << 21, 3808 .gpiomask = 1 << 21,
3802 .inputs = {{ 3809 .inputs = {{
3803 .name = name_tv, 3810 .type = SAA7134_INPUT_TV,
3804 .vmux = 1, 3811 .vmux = 1,
3805 .amux = TV, 3812 .amux = TV,
3806 .tv = 1, 3813 .tv = 1,
3807 .gpio = 0x0000000, 3814 .gpio = 0x0000000,
3808 }, { 3815 }, {
3809 .name = name_comp1, 3816 .type = SAA7134_INPUT_COMPOSITE1,
3810 .vmux = 3, 3817 .vmux = 3,
3811 .amux = LINE2, 3818 .amux = LINE2,
3812 }, { 3819 }, {
3813 .name = name_comp2, 3820 .type = SAA7134_INPUT_COMPOSITE2,
3814 .vmux = 0, 3821 .vmux = 0,
3815 .amux = LINE2, 3822 .amux = LINE2,
3816 }, { 3823 }, {
3817 .name = name_svideo, 3824 .type = SAA7134_INPUT_SVIDEO,
3818 .vmux = 8, 3825 .vmux = 8,
3819 .amux = LINE2, 3826 .amux = LINE2,
3820 } }, 3827 } },
3821 .radio = { 3828 .radio = {
3822 .name = name_radio, 3829 .type = SAA7134_INPUT_RADIO,
3823 .amux = TV, 3830 .amux = TV,
3824 .gpio = 0x0200000, 3831 .gpio = 0x0200000,
3825 }, 3832 },
@@ -3832,25 +3839,25 @@ struct saa7134_board saa7134_boards[] = {
3832 .tuner_addr = ADDR_UNSET, 3839 .tuner_addr = ADDR_UNSET,
3833 .radio_addr = ADDR_UNSET, 3840 .radio_addr = ADDR_UNSET,
3834 .inputs = {{ 3841 .inputs = {{
3835 .name = name_tv, 3842 .type = SAA7134_INPUT_TV,
3836 .vmux = 1, 3843 .vmux = 1,
3837 .amux = TV, 3844 .amux = TV,
3838 .tv = 1, 3845 .tv = 1,
3839 },{ 3846 },{
3840 .name = name_comp1, 3847 .type = SAA7134_INPUT_COMPOSITE1,
3841 .vmux = 3, 3848 .vmux = 3,
3842 .amux = LINE1, 3849 .amux = LINE1,
3843 },{ 3850 },{
3844 .name = name_comp2, 3851 .type = SAA7134_INPUT_COMPOSITE2,
3845 .vmux = 0, 3852 .vmux = 0,
3846 .amux = LINE1, 3853 .amux = LINE1,
3847 },{ 3854 },{
3848 .name = name_svideo, 3855 .type = SAA7134_INPUT_SVIDEO,
3849 .vmux = 8, 3856 .vmux = 8,
3850 .amux = LINE1, 3857 .amux = LINE1,
3851 }}, 3858 }},
3852 .mute = { 3859 .mute = {
3853 .name = name_mute, 3860 .type = SAA7134_INPUT_MUTE,
3854 .amux = TV, 3861 .amux = TV,
3855 }, 3862 },
3856 }, 3863 },
@@ -3864,24 +3871,24 @@ struct saa7134_board saa7134_boards[] = {
3864 .radio_addr = ADDR_UNSET, 3871 .radio_addr = ADDR_UNSET,
3865 .gpiomask = 0x7000, 3872 .gpiomask = 0x7000,
3866 .inputs = {{ 3873 .inputs = {{
3867 .name = name_tv, 3874 .type = SAA7134_INPUT_TV,
3868 .vmux = 1, 3875 .vmux = 1,
3869 .amux = LINE2, 3876 .amux = LINE2,
3870 .gpio = 0x0000, 3877 .gpio = 0x0000,
3871 .tv = 1, 3878 .tv = 1,
3872 },{ 3879 },{
3873 .name = name_comp1, 3880 .type = SAA7134_INPUT_COMPOSITE1,
3874 .vmux = 3, 3881 .vmux = 3,
3875 .amux = LINE1, 3882 .amux = LINE1,
3876 .gpio = 0x2000, 3883 .gpio = 0x2000,
3877 },{ 3884 },{
3878 .name = name_svideo, 3885 .type = SAA7134_INPUT_SVIDEO,
3879 .vmux = 8, 3886 .vmux = 8,
3880 .amux = LINE1, 3887 .amux = LINE1,
3881 .gpio = 0x2000, 3888 .gpio = 0x2000,
3882 }}, 3889 }},
3883 .mute = { 3890 .mute = {
3884 .name = name_mute, 3891 .type = SAA7134_INPUT_MUTE,
3885 .amux = LINE2, 3892 .amux = LINE2,
3886 .gpio = 0x3000, 3893 .gpio = 0x3000,
3887 }, 3894 },
@@ -3896,7 +3903,7 @@ struct saa7134_board saa7134_boards[] = {
3896 .tda829x_conf = { .lna_cfg = TDA8290_LNA_OFF }, 3903 .tda829x_conf = { .lna_cfg = TDA8290_LNA_OFF },
3897 .mpeg = SAA7134_MPEG_DVB, 3904 .mpeg = SAA7134_MPEG_DVB,
3898 .inputs = {{ 3905 .inputs = {{
3899 .name = name_tv, /* FIXME: analog tv untested */ 3906 .type = SAA7134_INPUT_TV, /* FIXME: analog tv untested */
3900 .vmux = 1, 3907 .vmux = 1,
3901 .amux = TV, 3908 .amux = TV,
3902 .tv = 1, 3909 .tv = 1,
@@ -3912,26 +3919,26 @@ struct saa7134_board saa7134_boards[] = {
3912 .tda829x_conf = { .lna_cfg = TDA8290_LNA_GP0_HIGH_OFF }, 3919 .tda829x_conf = { .lna_cfg = TDA8290_LNA_GP0_HIGH_OFF },
3913 .gpiomask = 0x020200000, 3920 .gpiomask = 0x020200000,
3914 .inputs = {{ 3921 .inputs = {{
3915 .name = name_tv, 3922 .type = SAA7134_INPUT_TV,
3916 .vmux = 1, 3923 .vmux = 1,
3917 .amux = TV, 3924 .amux = TV,
3918 .tv = 1, 3925 .tv = 1,
3919 }, { 3926 }, {
3920 .name = name_comp1, 3927 .type = SAA7134_INPUT_COMPOSITE1,
3921 .vmux = 3, 3928 .vmux = 3,
3922 .amux = LINE1, 3929 .amux = LINE1,
3923 }, { 3930 }, {
3924 .name = name_svideo, 3931 .type = SAA7134_INPUT_SVIDEO,
3925 .vmux = 8, 3932 .vmux = 8,
3926 .amux = LINE1, 3933 .amux = LINE1,
3927 } }, 3934 } },
3928 .radio = { 3935 .radio = {
3929 .name = name_radio, 3936 .type = SAA7134_INPUT_RADIO,
3930 .amux = TV, 3937 .amux = TV,
3931 .gpio = 0x00200000, 3938 .gpio = 0x00200000,
3932 }, 3939 },
3933 .mute = { 3940 .mute = {
3934 .name = name_mute, 3941 .type = SAA7134_INPUT_MUTE,
3935 .amux = TV, 3942 .amux = TV,
3936 .gpio = 0x01, 3943 .gpio = 0x01,
3937 }, 3944 },
@@ -3946,26 +3953,26 @@ struct saa7134_board saa7134_boards[] = {
3946 .tda829x_conf = { .lna_cfg = TDA8290_LNA_OFF }, 3953 .tda829x_conf = { .lna_cfg = TDA8290_LNA_OFF },
3947 .gpiomask = 0x020200000, 3954 .gpiomask = 0x020200000,
3948 .inputs = {{ 3955 .inputs = {{
3949 .name = name_tv, 3956 .type = SAA7134_INPUT_TV,
3950 .vmux = 1, 3957 .vmux = 1,
3951 .amux = TV, 3958 .amux = TV,
3952 .tv = 1, 3959 .tv = 1,
3953 }, { 3960 }, {
3954 .name = name_comp1, 3961 .type = SAA7134_INPUT_COMPOSITE1,
3955 .vmux = 3, 3962 .vmux = 3,
3956 .amux = LINE1, 3963 .amux = LINE1,
3957 }, { 3964 }, {
3958 .name = name_svideo, 3965 .type = SAA7134_INPUT_SVIDEO,
3959 .vmux = 8, 3966 .vmux = 8,
3960 .amux = LINE1, 3967 .amux = LINE1,
3961 } }, 3968 } },
3962 .radio = { 3969 .radio = {
3963 .name = name_radio, 3970 .type = SAA7134_INPUT_RADIO,
3964 .amux = TV, 3971 .amux = TV,
3965 .gpio = 0x00200000, 3972 .gpio = 0x00200000,
3966 }, 3973 },
3967 .mute = { 3974 .mute = {
3968 .name = name_mute, 3975 .type = SAA7134_INPUT_MUTE,
3969 .amux = TV, 3976 .amux = TV,
3970 .gpio = 0x01, 3977 .gpio = 0x01,
3971 }, 3978 },
@@ -3981,21 +3988,21 @@ struct saa7134_board saa7134_boards[] = {
3981 .radio_addr = ADDR_UNSET, 3988 .radio_addr = ADDR_UNSET,
3982 .gpiomask = 0x00008000, 3989 .gpiomask = 0x00008000,
3983 .inputs = {{ 3990 .inputs = {{
3984 .name = name_svideo, 3991 .type = SAA7134_INPUT_SVIDEO,
3985 .vmux = 8, 3992 .vmux = 8,
3986 .amux = LINE1, 3993 .amux = LINE1,
3987 },{ 3994 },{
3988 .name = name_comp1, 3995 .type = SAA7134_INPUT_COMPOSITE1,
3989 .vmux = 1, 3996 .vmux = 1,
3990 .amux = LINE1, 3997 .amux = LINE1,
3991 },{ 3998 },{
3992 .name = name_tv, 3999 .type = SAA7134_INPUT_TV,
3993 .vmux = 3, 4000 .vmux = 3,
3994 .amux = LINE2, 4001 .amux = LINE2,
3995 .tv = 1, 4002 .tv = 1,
3996 }}, 4003 }},
3997 .mute = { 4004 .mute = {
3998 .name = name_mute, 4005 .type = SAA7134_INPUT_MUTE,
3999 .amux = LINE1, 4006 .amux = LINE1,
4000 }, 4007 },
4001 }, 4008 },
@@ -4010,15 +4017,15 @@ struct saa7134_board saa7134_boards[] = {
4010 .radio_addr = ADDR_UNSET, 4017 .radio_addr = ADDR_UNSET,
4011 .gpiomask = 0x00008000, 4018 .gpiomask = 0x00008000,
4012 .inputs = {{ 4019 .inputs = {{
4013 .name = name_svideo, 4020 .type = SAA7134_INPUT_SVIDEO,
4014 .vmux = 8, 4021 .vmux = 8,
4015 .amux = LINE1, 4022 .amux = LINE1,
4016 },{ 4023 },{
4017 .name = name_comp1, 4024 .type = SAA7134_INPUT_COMPOSITE1,
4018 .vmux = 1, 4025 .vmux = 1,
4019 .amux = LINE1, 4026 .amux = LINE1,
4020 },{ 4027 },{
4021 .name = name_tv, 4028 .type = SAA7134_INPUT_TV,
4022 .vmux = 3, 4029 .vmux = 3,
4023 .amux = LINE2, 4030 .amux = LINE2,
4024 .tv = 1, 4031 .tv = 1,
@@ -4035,21 +4042,21 @@ struct saa7134_board saa7134_boards[] = {
4035 .radio_addr = ADDR_UNSET, 4042 .radio_addr = ADDR_UNSET,
4036 .gpiomask = 0x00008000, 4043 .gpiomask = 0x00008000,
4037 .inputs = {{ 4044 .inputs = {{
4038 .name = name_svideo, 4045 .type = SAA7134_INPUT_SVIDEO,
4039 .vmux = 8, 4046 .vmux = 8,
4040 .amux = LINE1, 4047 .amux = LINE1,
4041 },{ 4048 },{
4042 .name = name_comp1, 4049 .type = SAA7134_INPUT_COMPOSITE1,
4043 .vmux = 1, 4050 .vmux = 1,
4044 .amux = LINE1, 4051 .amux = LINE1,
4045 },{ 4052 },{
4046 .name = name_tv, 4053 .type = SAA7134_INPUT_TV,
4047 .vmux = 3, 4054 .vmux = 3,
4048 .amux = LINE2, 4055 .amux = LINE2,
4049 .tv = 1, 4056 .tv = 1,
4050 }}, 4057 }},
4051 .radio = { 4058 .radio = {
4052 .name = name_radio, 4059 .type = SAA7134_INPUT_RADIO,
4053 .amux = LINE2, 4060 .amux = LINE2,
4054 }, 4061 },
4055 }, 4062 },
@@ -4065,15 +4072,15 @@ struct saa7134_board saa7134_boards[] = {
4065 .tda9887_conf = TDA9887_PRESENT, 4072 .tda9887_conf = TDA9887_PRESENT,
4066 .gpiomask = 0x00008000, 4073 .gpiomask = 0x00008000,
4067 .inputs = {{ 4074 .inputs = {{
4068 .name = name_svideo, 4075 .type = SAA7134_INPUT_SVIDEO,
4069 .vmux = 8, 4076 .vmux = 8,
4070 .amux = LINE1, 4077 .amux = LINE1,
4071 },{ 4078 },{
4072 .name = name_comp1, 4079 .type = SAA7134_INPUT_COMPOSITE1,
4073 .vmux = 3, 4080 .vmux = 3,
4074 .amux = LINE1, 4081 .amux = LINE1,
4075 },{ 4082 },{
4076 .name = name_tv, 4083 .type = SAA7134_INPUT_TV,
4077 .vmux = 3, 4084 .vmux = 3,
4078 .amux = LINE2, 4085 .amux = LINE2,
4079 .tv = 1, 4086 .tv = 1,
@@ -4092,21 +4099,21 @@ struct saa7134_board saa7134_boards[] = {
4092 .tda9887_conf = TDA9887_PRESENT, 4099 .tda9887_conf = TDA9887_PRESENT,
4093 .gpiomask = 0x00008000, 4100 .gpiomask = 0x00008000,
4094 .inputs = {{ 4101 .inputs = {{
4095 .name = name_svideo, 4102 .type = SAA7134_INPUT_SVIDEO,
4096 .vmux = 8, 4103 .vmux = 8,
4097 .amux = LINE1, 4104 .amux = LINE1,
4098 },{ 4105 },{
4099 .name = name_comp1, 4106 .type = SAA7134_INPUT_COMPOSITE1,
4100 .vmux = 3, 4107 .vmux = 3,
4101 .amux = LINE1, 4108 .amux = LINE1,
4102 },{ 4109 },{
4103 .name = name_tv, 4110 .type = SAA7134_INPUT_TV,
4104 .vmux = 3, 4111 .vmux = 3,
4105 .amux = LINE2, 4112 .amux = LINE2,
4106 .tv = 1, 4113 .tv = 1,
4107 }}, 4114 }},
4108 .radio = { 4115 .radio = {
4109 .name = name_radio, 4116 .type = SAA7134_INPUT_RADIO,
4110 .amux = LINE2, 4117 .amux = LINE2,
4111 }, 4118 },
4112 }, 4119 },
@@ -4122,17 +4129,17 @@ struct saa7134_board saa7134_boards[] = {
4122 .tda9887_conf = TDA9887_PRESENT, 4129 .tda9887_conf = TDA9887_PRESENT,
4123 .gpiomask = 0x00008000, 4130 .gpiomask = 0x00008000,
4124 .inputs = {{ 4131 .inputs = {{
4125 .name = name_svideo, 4132 .type = SAA7134_INPUT_SVIDEO,
4126 .vmux = 8, 4133 .vmux = 8,
4127 .amux = LINE1, 4134 .amux = LINE1,
4128 .gpio = 0xc0c000, 4135 .gpio = 0xc0c000,
4129 },{ 4136 },{
4130 .name = name_comp1, 4137 .type = SAA7134_INPUT_COMPOSITE1,
4131 .vmux = 1, 4138 .vmux = 1,
4132 .amux = LINE1, 4139 .amux = LINE1,
4133 .gpio = 0xc0c000, 4140 .gpio = 0xc0c000,
4134 },{ 4141 },{
4135 .name = name_tv, 4142 .type = SAA7134_INPUT_TV,
4136 .vmux = 3, 4143 .vmux = 3,
4137 .amux = TV, 4144 .amux = TV,
4138 .tv = 1, 4145 .tv = 1,
@@ -4151,24 +4158,24 @@ struct saa7134_board saa7134_boards[] = {
4151 .tda9887_conf = TDA9887_PRESENT, 4158 .tda9887_conf = TDA9887_PRESENT,
4152 .gpiomask = 0x00008000, 4159 .gpiomask = 0x00008000,
4153 .inputs = {{ 4160 .inputs = {{
4154 .name = name_svideo, 4161 .type = SAA7134_INPUT_SVIDEO,
4155 .vmux = 8, 4162 .vmux = 8,
4156 .amux = LINE1, 4163 .amux = LINE1,
4157 .gpio = 0xc0c000, 4164 .gpio = 0xc0c000,
4158 },{ 4165 },{
4159 .name = name_comp1, 4166 .type = SAA7134_INPUT_COMPOSITE1,
4160 .vmux = 1, 4167 .vmux = 1,
4161 .amux = LINE1, 4168 .amux = LINE1,
4162 .gpio = 0xc0c000, 4169 .gpio = 0xc0c000,
4163 },{ 4170 },{
4164 .name = name_tv, 4171 .type = SAA7134_INPUT_TV,
4165 .vmux = 3, 4172 .vmux = 3,
4166 .amux = TV, 4173 .amux = TV,
4167 .tv = 1, 4174 .tv = 1,
4168 .gpio = 0xc0c000, 4175 .gpio = 0xc0c000,
4169 }}, 4176 }},
4170 .radio = { 4177 .radio = {
4171 .name = name_radio, 4178 .type = SAA7134_INPUT_RADIO,
4172 .amux = LINE2, 4179 .amux = LINE2,
4173 .gpio = 0xc0c000, 4180 .gpio = 0xc0c000,
4174 }, 4181 },
@@ -4185,16 +4192,16 @@ struct saa7134_board saa7134_boards[] = {
4185 .tda9887_conf = TDA9887_PRESENT, 4192 .tda9887_conf = TDA9887_PRESENT,
4186 .gpiomask = 0x00008000, 4193 .gpiomask = 0x00008000,
4187 .inputs = {{ 4194 .inputs = {{
4188 .name = name_tv, 4195 .type = SAA7134_INPUT_TV,
4189 .vmux = 3, 4196 .vmux = 3,
4190 .amux = TV, 4197 .amux = TV,
4191 .tv = 1, 4198 .tv = 1,
4192 },{ 4199 },{
4193 .name = name_comp1, 4200 .type = SAA7134_INPUT_COMPOSITE1,
4194 .vmux = 1, 4201 .vmux = 1,
4195 .amux = LINE1, 4202 .amux = LINE1,
4196 },{ 4203 },{
4197 .name = name_svideo, 4204 .type = SAA7134_INPUT_SVIDEO,
4198 .vmux = 8, 4205 .vmux = 8,
4199 .amux = LINE1, 4206 .amux = LINE1,
4200 }}, 4207 }},
@@ -4211,25 +4218,25 @@ struct saa7134_board saa7134_boards[] = {
4211 .tda9887_conf = TDA9887_PRESENT, 4218 .tda9887_conf = TDA9887_PRESENT,
4212 .gpiomask = 0x00008000, 4219 .gpiomask = 0x00008000,
4213 .inputs = {{ 4220 .inputs = {{
4214 .name = name_tv, 4221 .type = SAA7134_INPUT_TV,
4215 .vmux = 3, 4222 .vmux = 3,
4216 .amux = LINE2, 4223 .amux = LINE2,
4217 .tv = 1, 4224 .tv = 1,
4218 }, { 4225 }, {
4219 .name = name_comp1, 4226 .type = SAA7134_INPUT_COMPOSITE1,
4220 .vmux = 1, 4227 .vmux = 1,
4221 .amux = LINE1, 4228 .amux = LINE1,
4222 }, { 4229 }, {
4223 .name = name_svideo, 4230 .type = SAA7134_INPUT_SVIDEO,
4224 .vmux = 8, 4231 .vmux = 8,
4225 .amux = LINE1, 4232 .amux = LINE1,
4226 } }, 4233 } },
4227 .mute = { 4234 .mute = {
4228 .name = name_mute, 4235 .type = SAA7134_INPUT_MUTE,
4229 .amux = LINE1, 4236 .amux = LINE1,
4230 }, 4237 },
4231 .radio = { 4238 .radio = {
4232 .name = name_radio, 4239 .type = SAA7134_INPUT_RADIO,
4233 .amux = LINE2, 4240 .amux = LINE2,
4234 }, 4241 },
4235 }, 4242 },
@@ -4246,25 +4253,25 @@ struct saa7134_board saa7134_boards[] = {
4246 .tda9887_conf = TDA9887_PRESENT, 4253 .tda9887_conf = TDA9887_PRESENT,
4247 .gpiomask = 0x00008000, 4254 .gpiomask = 0x00008000,
4248 .inputs = {{ 4255 .inputs = {{
4249 .name = name_tv, 4256 .type = SAA7134_INPUT_TV,
4250 .vmux = 3, 4257 .vmux = 3,
4251 .amux = LINE2, 4258 .amux = LINE2,
4252 .tv = 1, 4259 .tv = 1,
4253 },{ 4260 },{
4254 .name = name_comp1, 4261 .type = SAA7134_INPUT_COMPOSITE1,
4255 .vmux = 1, 4262 .vmux = 1,
4256 .amux = LINE1, 4263 .amux = LINE1,
4257 },{ 4264 },{
4258 .name = name_svideo, 4265 .type = SAA7134_INPUT_SVIDEO,
4259 .vmux = 8, 4266 .vmux = 8,
4260 .amux = LINE1, 4267 .amux = LINE1,
4261 }}, 4268 }},
4262 .mute = { 4269 .mute = {
4263 .name = name_mute, 4270 .type = SAA7134_INPUT_MUTE,
4264 .amux = LINE1, 4271 .amux = LINE1,
4265 }, 4272 },
4266 .radio = { 4273 .radio = {
4267 .name = name_radio, 4274 .type = SAA7134_INPUT_RADIO,
4268 .amux = LINE2, 4275 .amux = LINE2,
4269 }, 4276 },
4270 }, 4277 },
@@ -4280,21 +4287,21 @@ struct saa7134_board saa7134_boards[] = {
4280 .tda9887_conf = TDA9887_PRESENT, 4287 .tda9887_conf = TDA9887_PRESENT,
4281 .gpiomask = 0x00008000, 4288 .gpiomask = 0x00008000,
4282 .inputs = {{ 4289 .inputs = {{
4283 .name = name_tv, 4290 .type = SAA7134_INPUT_TV,
4284 .vmux = 3, 4291 .vmux = 3,
4285 .amux = TV, 4292 .amux = TV,
4286 .tv = 1, 4293 .tv = 1,
4287 },{ 4294 },{
4288 .name = name_comp1, 4295 .type = SAA7134_INPUT_COMPOSITE1,
4289 .vmux = 1, 4296 .vmux = 1,
4290 .amux = LINE1, 4297 .amux = LINE1,
4291 },{ 4298 },{
4292 .name = name_svideo, 4299 .type = SAA7134_INPUT_SVIDEO,
4293 .vmux = 8, 4300 .vmux = 8,
4294 .amux = LINE1, 4301 .amux = LINE1,
4295 }}, 4302 }},
4296 .radio = { 4303 .radio = {
4297 .name = name_radio, 4304 .type = SAA7134_INPUT_RADIO,
4298 .amux = LINE2, 4305 .amux = LINE2,
4299 }, 4306 },
4300 }, 4307 },
@@ -4311,21 +4318,21 @@ struct saa7134_board saa7134_boards[] = {
4311 .tda9887_conf = TDA9887_PRESENT, 4318 .tda9887_conf = TDA9887_PRESENT,
4312 .gpiomask = 0x00008000, 4319 .gpiomask = 0x00008000,
4313 .inputs = {{ 4320 .inputs = {{
4314 .name = name_tv, 4321 .type = SAA7134_INPUT_TV,
4315 .vmux = 3, 4322 .vmux = 3,
4316 .amux = TV, 4323 .amux = TV,
4317 .tv = 1, 4324 .tv = 1,
4318 }, { 4325 }, {
4319 .name = name_comp1, 4326 .type = SAA7134_INPUT_COMPOSITE1,
4320 .vmux = 1, 4327 .vmux = 1,
4321 .amux = LINE1, 4328 .amux = LINE1,
4322 }, { 4329 }, {
4323 .name = name_svideo, 4330 .type = SAA7134_INPUT_SVIDEO,
4324 .vmux = 8, 4331 .vmux = 8,
4325 .amux = LINE1, 4332 .amux = LINE1,
4326 } }, 4333 } },
4327 .radio = { 4334 .radio = {
4328 .name = name_radio, 4335 .type = SAA7134_INPUT_RADIO,
4329 .amux = LINE2, 4336 .amux = LINE2,
4330 }, 4337 },
4331 }, 4338 },
@@ -4342,21 +4349,21 @@ struct saa7134_board saa7134_boards[] = {
4342 .tda9887_conf = TDA9887_PRESENT, 4349 .tda9887_conf = TDA9887_PRESENT,
4343 .gpiomask = 0x00008000, 4350 .gpiomask = 0x00008000,
4344 .inputs = {{ 4351 .inputs = {{
4345 .name = name_tv, 4352 .type = SAA7134_INPUT_TV,
4346 .vmux = 3, 4353 .vmux = 3,
4347 .amux = TV, 4354 .amux = TV,
4348 .tv = 1, 4355 .tv = 1,
4349 }, { 4356 }, {
4350 .name = name_comp1, 4357 .type = SAA7134_INPUT_COMPOSITE1,
4351 .vmux = 1, 4358 .vmux = 1,
4352 .amux = LINE1, 4359 .amux = LINE1,
4353 }, { 4360 }, {
4354 .name = name_svideo, 4361 .type = SAA7134_INPUT_SVIDEO,
4355 .vmux = 8, 4362 .vmux = 8,
4356 .amux = LINE1, 4363 .amux = LINE1,
4357 } }, 4364 } },
4358 .radio = { 4365 .radio = {
4359 .name = name_radio, 4366 .type = SAA7134_INPUT_RADIO,
4360 .amux = LINE2, 4367 .amux = LINE2,
4361 }, 4368 },
4362 }, 4369 },
@@ -4372,24 +4379,24 @@ struct saa7134_board saa7134_boards[] = {
4372 .tda9887_conf = TDA9887_PRESENT, 4379 .tda9887_conf = TDA9887_PRESENT,
4373 .gpiomask = 0x000A8004, 4380 .gpiomask = 0x000A8004,
4374 .inputs = {{ 4381 .inputs = {{
4375 .name = name_tv, 4382 .type = SAA7134_INPUT_TV,
4376 .vmux = 3, 4383 .vmux = 3,
4377 .amux = TV, 4384 .amux = TV,
4378 .tv = 1, 4385 .tv = 1,
4379 .gpio = 0x000A8004, 4386 .gpio = 0x000A8004,
4380 }, { 4387 }, {
4381 .name = name_comp1, 4388 .type = SAA7134_INPUT_COMPOSITE1,
4382 .vmux = 1, 4389 .vmux = 1,
4383 .amux = LINE1, 4390 .amux = LINE1,
4384 .gpio = 0x000A8000, 4391 .gpio = 0x000A8000,
4385 }, { 4392 }, {
4386 .name = name_svideo, 4393 .type = SAA7134_INPUT_SVIDEO,
4387 .vmux = 8, 4394 .vmux = 8,
4388 .amux = LINE1, 4395 .amux = LINE1,
4389 .gpio = 0x000A8000, 4396 .gpio = 0x000A8000,
4390 } }, 4397 } },
4391 .radio = { 4398 .radio = {
4392 .name = name_radio, 4399 .type = SAA7134_INPUT_RADIO,
4393 .amux = LINE2, 4400 .amux = LINE2,
4394 .gpio = 0x000A8000, 4401 .gpio = 0x000A8000,
4395 }, 4402 },
@@ -4404,21 +4411,21 @@ struct saa7134_board saa7134_boards[] = {
4404 .radio_addr = ADDR_UNSET, 4411 .radio_addr = ADDR_UNSET,
4405 .tda9887_conf = TDA9887_PRESENT, 4412 .tda9887_conf = TDA9887_PRESENT,
4406 .inputs = {{ 4413 .inputs = {{
4407 .name = name_tv, 4414 .type = SAA7134_INPUT_TV,
4408 .vmux = 3, 4415 .vmux = 3,
4409 .amux = TV, 4416 .amux = TV,
4410 .tv = 1, 4417 .tv = 1,
4411 }, { 4418 }, {
4412 .name = name_comp1, 4419 .type = SAA7134_INPUT_COMPOSITE1,
4413 .vmux = 1, 4420 .vmux = 1,
4414 .amux = LINE1, 4421 .amux = LINE1,
4415 }, { 4422 }, {
4416 .name = name_svideo, 4423 .type = SAA7134_INPUT_SVIDEO,
4417 .vmux = 8, 4424 .vmux = 8,
4418 .amux = LINE1, 4425 .amux = LINE1,
4419 } }, 4426 } },
4420 .radio = { 4427 .radio = {
4421 .name = name_radio, 4428 .type = SAA7134_INPUT_RADIO,
4422 .amux = LINE2, 4429 .amux = LINE2,
4423 }, 4430 },
4424 }, 4431 },
@@ -4432,21 +4439,21 @@ struct saa7134_board saa7134_boards[] = {
4432 .radio_addr = ADDR_UNSET, 4439 .radio_addr = ADDR_UNSET,
4433 .tda9887_conf = TDA9887_PRESENT, 4440 .tda9887_conf = TDA9887_PRESENT,
4434 .inputs = {{ 4441 .inputs = {{
4435 .name = name_tv, 4442 .type = SAA7134_INPUT_TV,
4436 .vmux = 3, 4443 .vmux = 3,
4437 .amux = TV, 4444 .amux = TV,
4438 .tv = 1, 4445 .tv = 1,
4439 }, { 4446 }, {
4440 .name = name_comp1, 4447 .type = SAA7134_INPUT_COMPOSITE1,
4441 .vmux = 1, 4448 .vmux = 1,
4442 .amux = LINE1, 4449 .amux = LINE1,
4443 }, { 4450 }, {
4444 .name = name_svideo, 4451 .type = SAA7134_INPUT_SVIDEO,
4445 .vmux = 8, 4452 .vmux = 8,
4446 .amux = LINE1, 4453 .amux = LINE1,
4447 } }, 4454 } },
4448 .radio = { 4455 .radio = {
4449 .name = name_radio, 4456 .type = SAA7134_INPUT_RADIO,
4450 .amux = LINE2, 4457 .amux = LINE2,
4451 }, 4458 },
4452 }, 4459 },
@@ -4460,21 +4467,21 @@ struct saa7134_board saa7134_boards[] = {
4460 .radio_addr = ADDR_UNSET, 4467 .radio_addr = ADDR_UNSET,
4461 .tda9887_conf = TDA9887_PRESENT, 4468 .tda9887_conf = TDA9887_PRESENT,
4462 .inputs = {{ 4469 .inputs = {{
4463 .name = name_tv, 4470 .type = SAA7134_INPUT_TV,
4464 .vmux = 3, 4471 .vmux = 3,
4465 .amux = TV, 4472 .amux = TV,
4466 .tv = 1, 4473 .tv = 1,
4467 }, { 4474 }, {
4468 .name = name_comp1, 4475 .type = SAA7134_INPUT_COMPOSITE1,
4469 .vmux = 1, 4476 .vmux = 1,
4470 .amux = LINE1, 4477 .amux = LINE1,
4471 }, { 4478 }, {
4472 .name = name_svideo, 4479 .type = SAA7134_INPUT_SVIDEO,
4473 .vmux = 8, 4480 .vmux = 8,
4474 .amux = LINE1, 4481 .amux = LINE1,
4475 } }, 4482 } },
4476 .radio = { 4483 .radio = {
4477 .name = name_radio, 4484 .type = SAA7134_INPUT_RADIO,
4478 .amux = LINE2, 4485 .amux = LINE2,
4479 }, 4486 },
4480 }, 4487 },
@@ -4488,21 +4495,21 @@ struct saa7134_board saa7134_boards[] = {
4488 .radio_addr = ADDR_UNSET, 4495 .radio_addr = ADDR_UNSET,
4489 .tda9887_conf = TDA9887_PRESENT, 4496 .tda9887_conf = TDA9887_PRESENT,
4490 .inputs = {{ 4497 .inputs = {{
4491 .name = name_tv, 4498 .type = SAA7134_INPUT_TV,
4492 .vmux = 3, 4499 .vmux = 3,
4493 .amux = TV, 4500 .amux = TV,
4494 .tv = 1, 4501 .tv = 1,
4495 }, { 4502 }, {
4496 .name = name_comp1, 4503 .type = SAA7134_INPUT_COMPOSITE1,
4497 .vmux = 1, 4504 .vmux = 1,
4498 .amux = LINE1, 4505 .amux = LINE1,
4499 }, { 4506 }, {
4500 .name = name_svideo, 4507 .type = SAA7134_INPUT_SVIDEO,
4501 .vmux = 8, 4508 .vmux = 8,
4502 .amux = LINE1, 4509 .amux = LINE1,
4503 } }, 4510 } },
4504 .radio = { 4511 .radio = {
4505 .name = name_radio, 4512 .type = SAA7134_INPUT_RADIO,
4506 .amux = LINE2, 4513 .amux = LINE2,
4507 }, 4514 },
4508 }, 4515 },
@@ -4517,21 +4524,21 @@ struct saa7134_board saa7134_boards[] = {
4517 .rds_addr = 0x10, 4524 .rds_addr = 0x10,
4518 .tda9887_conf = TDA9887_PRESENT, 4525 .tda9887_conf = TDA9887_PRESENT,
4519 .inputs = {{ 4526 .inputs = {{
4520 .name = name_tv, 4527 .type = SAA7134_INPUT_TV,
4521 .vmux = 3, 4528 .vmux = 3,
4522 .amux = TV, 4529 .amux = TV,
4523 .tv = 1, 4530 .tv = 1,
4524 }, { 4531 }, {
4525 .name = name_comp1, 4532 .type = SAA7134_INPUT_COMPOSITE1,
4526 .vmux = 1, 4533 .vmux = 1,
4527 .amux = LINE1, 4534 .amux = LINE1,
4528 }, { 4535 }, {
4529 .name = name_svideo, 4536 .type = SAA7134_INPUT_SVIDEO,
4530 .vmux = 8, 4537 .vmux = 8,
4531 .amux = LINE1, 4538 .amux = LINE1,
4532 } }, 4539 } },
4533 .radio = { 4540 .radio = {
4534 .name = name_radio, 4541 .type = SAA7134_INPUT_RADIO,
4535 .amux = LINE2, 4542 .amux = LINE2,
4536 }, 4543 },
4537 }, 4544 },
@@ -4546,21 +4553,21 @@ struct saa7134_board saa7134_boards[] = {
4546 .rds_addr = 0x10, 4553 .rds_addr = 0x10,
4547 .tda9887_conf = TDA9887_PRESENT, 4554 .tda9887_conf = TDA9887_PRESENT,
4548 .inputs = {{ 4555 .inputs = {{
4549 .name = name_tv, 4556 .type = SAA7134_INPUT_TV,
4550 .vmux = 3, 4557 .vmux = 3,
4551 .amux = TV, 4558 .amux = TV,
4552 .tv = 1, 4559 .tv = 1,
4553 }, { 4560 }, {
4554 .name = name_comp1, 4561 .type = SAA7134_INPUT_COMPOSITE1,
4555 .vmux = 1, 4562 .vmux = 1,
4556 .amux = LINE1, 4563 .amux = LINE1,
4557 }, { 4564 }, {
4558 .name = name_svideo, 4565 .type = SAA7134_INPUT_SVIDEO,
4559 .vmux = 8, 4566 .vmux = 8,
4560 .amux = LINE1, 4567 .amux = LINE1,
4561 } }, 4568 } },
4562 .radio = { 4569 .radio = {
4563 .name = name_radio, 4570 .type = SAA7134_INPUT_RADIO,
4564 .amux = LINE2, 4571 .amux = LINE2,
4565 }, 4572 },
4566 }, 4573 },
@@ -4575,21 +4582,21 @@ struct saa7134_board saa7134_boards[] = {
4575 .rds_addr = 0x10, 4582 .rds_addr = 0x10,
4576 .tda9887_conf = TDA9887_PRESENT, 4583 .tda9887_conf = TDA9887_PRESENT,
4577 .inputs = {{ 4584 .inputs = {{
4578 .name = name_tv, 4585 .type = SAA7134_INPUT_TV,
4579 .vmux = 3, 4586 .vmux = 3,
4580 .amux = TV, 4587 .amux = TV,
4581 .tv = 1, 4588 .tv = 1,
4582 }, { 4589 }, {
4583 .name = name_comp1, 4590 .type = SAA7134_INPUT_COMPOSITE1,
4584 .vmux = 1, 4591 .vmux = 1,
4585 .amux = LINE1, 4592 .amux = LINE1,
4586 }, { 4593 }, {
4587 .name = name_svideo, 4594 .type = SAA7134_INPUT_SVIDEO,
4588 .vmux = 8, 4595 .vmux = 8,
4589 .amux = LINE1, 4596 .amux = LINE1,
4590 } }, 4597 } },
4591 .radio = { 4598 .radio = {
4592 .name = name_radio, 4599 .type = SAA7134_INPUT_RADIO,
4593 .amux = LINE2, 4600 .amux = LINE2,
4594 }, 4601 },
4595 }, 4602 },
@@ -4604,21 +4611,21 @@ struct saa7134_board saa7134_boards[] = {
4604 .rds_addr = 0x10, 4611 .rds_addr = 0x10,
4605 .tda9887_conf = TDA9887_PRESENT, 4612 .tda9887_conf = TDA9887_PRESENT,
4606 .inputs = {{ 4613 .inputs = {{
4607 .name = name_tv, 4614 .type = SAA7134_INPUT_TV,
4608 .vmux = 3, 4615 .vmux = 3,
4609 .amux = TV, 4616 .amux = TV,
4610 .tv = 1, 4617 .tv = 1,
4611 },{ 4618 },{
4612 .name = name_comp1, 4619 .type = SAA7134_INPUT_COMPOSITE1,
4613 .vmux = 1, 4620 .vmux = 1,
4614 .amux = LINE1, 4621 .amux = LINE1,
4615 },{ 4622 },{
4616 .name = name_svideo, 4623 .type = SAA7134_INPUT_SVIDEO,
4617 .vmux = 8, 4624 .vmux = 8,
4618 .amux = LINE1, 4625 .amux = LINE1,
4619 }}, 4626 }},
4620 .radio = { 4627 .radio = {
4621 .name = name_radio, 4628 .type = SAA7134_INPUT_RADIO,
4622 .amux = LINE2, 4629 .amux = LINE2,
4623 }, 4630 },
4624 }, 4631 },
@@ -4636,21 +4643,21 @@ struct saa7134_board saa7134_boards[] = {
4636 .empress_addr = 0x20, 4643 .empress_addr = 0x20,
4637 .tda9887_conf = TDA9887_PRESENT, 4644 .tda9887_conf = TDA9887_PRESENT,
4638 .inputs = { { 4645 .inputs = { {
4639 .name = name_tv, 4646 .type = SAA7134_INPUT_TV,
4640 .vmux = 3, 4647 .vmux = 3,
4641 .amux = TV, 4648 .amux = TV,
4642 .tv = 1, 4649 .tv = 1,
4643 }, { 4650 }, {
4644 .name = name_comp1, 4651 .type = SAA7134_INPUT_COMPOSITE1,
4645 .vmux = 1, 4652 .vmux = 1,
4646 .amux = LINE1, 4653 .amux = LINE1,
4647 }, { 4654 }, {
4648 .name = name_svideo, 4655 .type = SAA7134_INPUT_SVIDEO,
4649 .vmux = 8, 4656 .vmux = 8,
4650 .amux = LINE1, 4657 .amux = LINE1,
4651 } }, 4658 } },
4652 .radio = { 4659 .radio = {
4653 .name = name_radio, 4660 .type = SAA7134_INPUT_RADIO,
4654 .amux = LINE2, 4661 .amux = LINE2,
4655 }, 4662 },
4656 .mpeg = SAA7134_MPEG_EMPRESS, 4663 .mpeg = SAA7134_MPEG_EMPRESS,
@@ -4673,21 +4680,21 @@ struct saa7134_board saa7134_boards[] = {
4673 .empress_addr = 0x20, 4680 .empress_addr = 0x20,
4674 .tda9887_conf = TDA9887_PRESENT, 4681 .tda9887_conf = TDA9887_PRESENT,
4675 .inputs = { { 4682 .inputs = { {
4676 .name = name_tv, 4683 .type = SAA7134_INPUT_TV,
4677 .vmux = 3, 4684 .vmux = 3,
4678 .amux = TV, 4685 .amux = TV,
4679 .tv = 1, 4686 .tv = 1,
4680 }, { 4687 }, {
4681 .name = name_comp1, 4688 .type = SAA7134_INPUT_COMPOSITE1,
4682 .vmux = 1, 4689 .vmux = 1,
4683 .amux = LINE1, 4690 .amux = LINE1,
4684 }, { 4691 }, {
4685 .name = name_svideo, 4692 .type = SAA7134_INPUT_SVIDEO,
4686 .vmux = 8, 4693 .vmux = 8,
4687 .amux = LINE1, 4694 .amux = LINE1,
4688 } }, 4695 } },
4689 .radio = { 4696 .radio = {
4690 .name = name_radio, 4697 .type = SAA7134_INPUT_RADIO,
4691 .amux = LINE2, 4698 .amux = LINE2,
4692 }, 4699 },
4693 .mpeg = SAA7134_MPEG_EMPRESS, 4700 .mpeg = SAA7134_MPEG_EMPRESS,
@@ -4712,21 +4719,21 @@ struct saa7134_board saa7134_boards[] = {
4712 .empress_addr = 0x20, 4719 .empress_addr = 0x20,
4713 .tda9887_conf = TDA9887_PRESENT, 4720 .tda9887_conf = TDA9887_PRESENT,
4714 .inputs = { { 4721 .inputs = { {
4715 .name = name_tv, 4722 .type = SAA7134_INPUT_TV,
4716 .vmux = 3, 4723 .vmux = 3,
4717 .amux = TV, 4724 .amux = TV,
4718 .tv = 1, 4725 .tv = 1,
4719 }, { 4726 }, {
4720 .name = name_comp1, 4727 .type = SAA7134_INPUT_COMPOSITE1,
4721 .vmux = 1, 4728 .vmux = 1,
4722 .amux = LINE1, 4729 .amux = LINE1,
4723 }, { 4730 }, {
4724 .name = name_svideo, 4731 .type = SAA7134_INPUT_SVIDEO,
4725 .vmux = 8, 4732 .vmux = 8,
4726 .amux = LINE1, 4733 .amux = LINE1,
4727 } }, 4734 } },
4728 .radio = { 4735 .radio = {
4729 .name = name_radio, 4736 .type = SAA7134_INPUT_RADIO,
4730 .amux = LINE2, 4737 .amux = LINE2,
4731 }, 4738 },
4732 .mpeg = SAA7134_MPEG_EMPRESS, 4739 .mpeg = SAA7134_MPEG_EMPRESS,
@@ -4747,21 +4754,21 @@ struct saa7134_board saa7134_boards[] = {
4747 .mpeg = SAA7134_MPEG_DVB, 4754 .mpeg = SAA7134_MPEG_DVB,
4748 .gpiomask = 0x0200000, 4755 .gpiomask = 0x0200000,
4749 .inputs = {{ 4756 .inputs = {{
4750 .name = name_tv, 4757 .type = SAA7134_INPUT_TV,
4751 .vmux = 1, 4758 .vmux = 1,
4752 .amux = TV, 4759 .amux = TV,
4753 .tv = 1, 4760 .tv = 1,
4754 }, { 4761 }, {
4755 .name = name_comp1, 4762 .type = SAA7134_INPUT_COMPOSITE1,
4756 .vmux = 3, 4763 .vmux = 3,
4757 .amux = LINE1, 4764 .amux = LINE1,
4758 }, { 4765 }, {
4759 .name = name_svideo, 4766 .type = SAA7134_INPUT_SVIDEO,
4760 .vmux = 8, /* untested */ 4767 .vmux = 8, /* untested */
4761 .amux = LINE1, 4768 .amux = LINE1,
4762 } }, 4769 } },
4763 .radio = { 4770 .radio = {
4764 .name = name_radio, 4771 .type = SAA7134_INPUT_RADIO,
4765 .amux = TV, 4772 .amux = TV,
4766 .gpio = 0x0200000, 4773 .gpio = 0x0200000,
4767 }, 4774 },
@@ -4776,30 +4783,30 @@ struct saa7134_board saa7134_boards[] = {
4776 .radio_addr = ADDR_UNSET, 4783 .radio_addr = ADDR_UNSET,
4777 .gpiomask = 0xf000, 4784 .gpiomask = 0xf000,
4778 .inputs = {{ 4785 .inputs = {{
4779 .name = name_tv_mono, 4786 .type = SAA7134_INPUT_TV_MONO,
4780 .vmux = 1, 4787 .vmux = 1,
4781 .amux = LINE2, 4788 .amux = LINE2,
4782 .gpio = 0x0000, 4789 .gpio = 0x0000,
4783 .tv = 1, 4790 .tv = 1,
4784 }, { 4791 }, {
4785 .name = name_comp1, 4792 .type = SAA7134_INPUT_COMPOSITE1,
4786 .vmux = 3, 4793 .vmux = 3,
4787 .amux = LINE1, 4794 .amux = LINE1,
4788 .gpio = 0x2000, 4795 .gpio = 0x2000,
4789 .tv = 1 4796 .tv = 1
4790 }, { 4797 }, {
4791 .name = name_svideo, 4798 .type = SAA7134_INPUT_SVIDEO,
4792 .vmux = 8, 4799 .vmux = 8,
4793 .amux = LINE1, 4800 .amux = LINE1,
4794 .gpio = 0x2000, 4801 .gpio = 0x2000,
4795 } }, 4802 } },
4796 .radio = { 4803 .radio = {
4797 .name = name_radio, 4804 .type = SAA7134_INPUT_RADIO,
4798 .amux = LINE2, 4805 .amux = LINE2,
4799 .gpio = 0x1000, 4806 .gpio = 0x1000,
4800 }, 4807 },
4801 .mute = { 4808 .mute = {
4802 .name = name_mute, 4809 .type = SAA7134_INPUT_MUTE,
4803 .amux = LINE2, 4810 .amux = LINE2,
4804 .gpio = 0x6000, 4811 .gpio = 0x6000,
4805 }, 4812 },
@@ -4813,11 +4820,11 @@ struct saa7134_board saa7134_boards[] = {
4813 .radio_addr = ADDR_UNSET, 4820 .radio_addr = ADDR_UNSET,
4814 .mpeg = SAA7134_MPEG_DVB, 4821 .mpeg = SAA7134_MPEG_DVB,
4815 .inputs = {{ 4822 .inputs = {{
4816 .name = name_comp1, 4823 .type = SAA7134_INPUT_COMPOSITE1,
4817 .vmux = 3, 4824 .vmux = 3,
4818 .amux = LINE1, 4825 .amux = LINE1,
4819 }, { 4826 }, {
4820 .name = name_svideo, 4827 .type = SAA7134_INPUT_SVIDEO,
4821 .vmux = 8, 4828 .vmux = 8,
4822 .amux = LINE1, 4829 .amux = LINE1,
4823 } }, 4830 } },
@@ -4832,16 +4839,16 @@ struct saa7134_board saa7134_boards[] = {
4832 .tda829x_conf = { .lna_cfg = TDA8290_LNA_OFF }, 4839 .tda829x_conf = { .lna_cfg = TDA8290_LNA_OFF },
4833 .mpeg = SAA7134_MPEG_DVB, 4840 .mpeg = SAA7134_MPEG_DVB,
4834 .inputs = {{ 4841 .inputs = {{
4835 .name = name_tv, 4842 .type = SAA7134_INPUT_TV,
4836 .vmux = 1, 4843 .vmux = 1,
4837 .amux = TV, 4844 .amux = TV,
4838 .tv = 1, 4845 .tv = 1,
4839 }, { 4846 }, {
4840 .name = name_comp1, 4847 .type = SAA7134_INPUT_COMPOSITE1,
4841 .vmux = 0, 4848 .vmux = 0,
4842 .amux = LINE1, 4849 .amux = LINE1,
4843 }, { 4850 }, {
4844 .name = name_svideo, 4851 .type = SAA7134_INPUT_SVIDEO,
4845 .vmux = 8, 4852 .vmux = 8,
4846 .amux = LINE1, 4853 .amux = LINE1,
4847 } }, 4854 } },
@@ -4857,21 +4864,21 @@ struct saa7134_board saa7134_boards[] = {
4857 .mpeg = SAA7134_MPEG_DVB, 4864 .mpeg = SAA7134_MPEG_DVB,
4858 .gpiomask = 0x0200000, 4865 .gpiomask = 0x0200000,
4859 .inputs = { { 4866 .inputs = { {
4860 .name = name_tv, 4867 .type = SAA7134_INPUT_TV,
4861 .vmux = 1, 4868 .vmux = 1,
4862 .amux = TV, 4869 .amux = TV,
4863 .tv = 1, 4870 .tv = 1,
4864 }, { 4871 }, {
4865 .name = name_comp1, 4872 .type = SAA7134_INPUT_COMPOSITE1,
4866 .vmux = 3, 4873 .vmux = 3,
4867 .amux = LINE1, 4874 .amux = LINE1,
4868 }, { 4875 }, {
4869 .name = name_svideo, 4876 .type = SAA7134_INPUT_SVIDEO,
4870 .vmux = 8, 4877 .vmux = 8,
4871 .amux = LINE1, 4878 .amux = LINE1,
4872 } }, 4879 } },
4873 .radio = { 4880 .radio = {
4874 .name = name_radio, 4881 .type = SAA7134_INPUT_RADIO,
4875 .amux = TV, 4882 .amux = TV,
4876 .gpio = 0x0200000, 4883 .gpio = 0x0200000,
4877 }, 4884 },
@@ -4885,21 +4892,21 @@ struct saa7134_board saa7134_boards[] = {
4885 .radio_addr = ADDR_UNSET, 4892 .radio_addr = ADDR_UNSET,
4886 .mpeg = SAA7134_MPEG_DVB, 4893 .mpeg = SAA7134_MPEG_DVB,
4887 .inputs = {{ 4894 .inputs = {{
4888 .name = name_tv, 4895 .type = SAA7134_INPUT_TV,
4889 .vmux = 1, 4896 .vmux = 1,
4890 .amux = TV, 4897 .amux = TV,
4891 .tv = 1, 4898 .tv = 1,
4892 }, { 4899 }, {
4893 .name = name_comp1, 4900 .type = SAA7134_INPUT_COMPOSITE1,
4894 .vmux = 3, 4901 .vmux = 3,
4895 .amux = LINE1, 4902 .amux = LINE1,
4896 }, { 4903 }, {
4897 .name = name_svideo, 4904 .type = SAA7134_INPUT_SVIDEO,
4898 .vmux = 8, 4905 .vmux = 8,
4899 .amux = LINE2, 4906 .amux = LINE2,
4900 } }, 4907 } },
4901 .radio = { 4908 .radio = {
4902 .name = name_radio, 4909 .type = SAA7134_INPUT_RADIO,
4903 .amux = TV, 4910 .amux = TV,
4904 }, 4911 },
4905 }, 4912 },
@@ -4912,21 +4919,21 @@ struct saa7134_board saa7134_boards[] = {
4912 .radio_addr = ADDR_UNSET, 4919 .radio_addr = ADDR_UNSET,
4913 .mpeg = SAA7134_MPEG_DVB, 4920 .mpeg = SAA7134_MPEG_DVB,
4914 .inputs = {{ 4921 .inputs = {{
4915 .name = name_tv, 4922 .type = SAA7134_INPUT_TV,
4916 .vmux = 1, 4923 .vmux = 1,
4917 .amux = TV, 4924 .amux = TV,
4918 .tv = 1, 4925 .tv = 1,
4919 }, { 4926 }, {
4920 .name = name_svideo, 4927 .type = SAA7134_INPUT_SVIDEO,
4921 .vmux = 8, 4928 .vmux = 8,
4922 .amux = LINE1, 4929 .amux = LINE1,
4923 }, { 4930 }, {
4924 .name = name_comp, 4931 .type = SAA7134_INPUT_COMPOSITE,
4925 .vmux = 0, 4932 .vmux = 0,
4926 .amux = LINE1, 4933 .amux = LINE1,
4927 } }, 4934 } },
4928 .radio = { 4935 .radio = {
4929 .name = name_radio, 4936 .type = SAA7134_INPUT_RADIO,
4930 .amux = TV, 4937 .amux = TV,
4931 }, 4938 },
4932 }, 4939 },
@@ -4938,16 +4945,16 @@ struct saa7134_board saa7134_boards[] = {
4938 .tuner_addr = ADDR_UNSET, 4945 .tuner_addr = ADDR_UNSET,
4939 .radio_addr = ADDR_UNSET, 4946 .radio_addr = ADDR_UNSET,
4940 .inputs = {{ 4947 .inputs = {{
4941 .name = name_tv, 4948 .type = SAA7134_INPUT_TV,
4942 .vmux = 1, 4949 .vmux = 1,
4943 .amux = TV, 4950 .amux = TV,
4944 .tv = 1, 4951 .tv = 1,
4945 }, { 4952 }, {
4946 .name = name_comp1, 4953 .type = SAA7134_INPUT_COMPOSITE1,
4947 .vmux = 3, 4954 .vmux = 3,
4948 .amux = LINE1, 4955 .amux = LINE1,
4949 }, { 4956 }, {
4950 .name = name_svideo, 4957 .type = SAA7134_INPUT_SVIDEO,
4951 .vmux = 8, 4958 .vmux = 8,
4952 .amux = LINE2, 4959 .amux = LINE2,
4953 } }, 4960 } },
@@ -4962,21 +4969,21 @@ struct saa7134_board saa7134_boards[] = {
4962 .radio_addr = ADDR_UNSET, 4969 .radio_addr = ADDR_UNSET,
4963 .mpeg = SAA7134_MPEG_DVB, 4970 .mpeg = SAA7134_MPEG_DVB,
4964 .inputs = {{ 4971 .inputs = {{
4965 .name = name_tv, 4972 .type = SAA7134_INPUT_TV,
4966 .vmux = 3, 4973 .vmux = 3,
4967 .amux = TV, 4974 .amux = TV,
4968 .tv = 1, 4975 .tv = 1,
4969 }, { 4976 }, {
4970 .name = name_comp1, 4977 .type = SAA7134_INPUT_COMPOSITE1,
4971 .vmux = 1, 4978 .vmux = 1,
4972 .amux = LINE2, 4979 .amux = LINE2,
4973 }, { 4980 }, {
4974 .name = name_svideo, 4981 .type = SAA7134_INPUT_SVIDEO,
4975 .vmux = 8, 4982 .vmux = 8,
4976 .amux = LINE2, 4983 .amux = LINE2,
4977 } }, 4984 } },
4978 .radio = { 4985 .radio = {
4979 .name = name_radio, 4986 .type = SAA7134_INPUT_RADIO,
4980 .amux = TV, 4987 .amux = TV,
4981 } 4988 }
4982 }, 4989 },
@@ -4990,11 +4997,11 @@ struct saa7134_board saa7134_boards[] = {
4990 .radio_addr = ADDR_UNSET, 4997 .radio_addr = ADDR_UNSET,
4991 .mpeg = SAA7134_MPEG_DVB, 4998 .mpeg = SAA7134_MPEG_DVB,
4992 .inputs = { { 4999 .inputs = { {
4993 .name = name_comp, 5000 .type = SAA7134_INPUT_COMPOSITE,
4994 .vmux = 1, 5001 .vmux = 1,
4995 .amux = LINE1, 5002 .amux = LINE1,
4996 }, { 5003 }, {
4997 .name = name_svideo, 5004 .type = SAA7134_INPUT_SVIDEO,
4998 .vmux = 6, 5005 .vmux = 6,
4999 .amux = LINE1, 5006 .amux = LINE1,
5000 } }, 5007 } },
@@ -5009,21 +5016,21 @@ struct saa7134_board saa7134_boards[] = {
5009 .radio_addr = ADDR_UNSET, 5016 .radio_addr = ADDR_UNSET,
5010 .mpeg = SAA7134_MPEG_DVB, 5017 .mpeg = SAA7134_MPEG_DVB,
5011 .inputs = { { 5018 .inputs = { {
5012 .name = name_tv, 5019 .type = SAA7134_INPUT_TV,
5013 .vmux = 4, 5020 .vmux = 4,
5014 .amux = TV, 5021 .amux = TV,
5015 .tv = 1, 5022 .tv = 1,
5016 }, { 5023 }, {
5017 .name = name_comp, 5024 .type = SAA7134_INPUT_COMPOSITE,
5018 .vmux = 1, 5025 .vmux = 1,
5019 .amux = LINE1, 5026 .amux = LINE1,
5020 }, { 5027 }, {
5021 .name = name_svideo, 5028 .type = SAA7134_INPUT_SVIDEO,
5022 .vmux = 6, 5029 .vmux = 6,
5023 .amux = LINE1, 5030 .amux = LINE1,
5024 } }, 5031 } },
5025 .radio = { 5032 .radio = {
5026 .name = name_radio, 5033 .type = SAA7134_INPUT_RADIO,
5027 .amux = TV, 5034 .amux = TV,
5028 }, 5035 },
5029 }, 5036 },
@@ -5038,21 +5045,21 @@ struct saa7134_board saa7134_boards[] = {
5038 .tda9887_conf = TDA9887_PRESENT, 5045 .tda9887_conf = TDA9887_PRESENT,
5039 .mpeg = SAA7134_MPEG_DVB, 5046 .mpeg = SAA7134_MPEG_DVB,
5040 .inputs = {{ 5047 .inputs = {{
5041 .name = name_tv, 5048 .type = SAA7134_INPUT_TV,
5042 .vmux = 3, 5049 .vmux = 3,
5043 .amux = TV, 5050 .amux = TV,
5044 .tv = 1, 5051 .tv = 1,
5045 }, { 5052 }, {
5046 .name = name_comp1, 5053 .type = SAA7134_INPUT_COMPOSITE1,
5047 .vmux = 1, 5054 .vmux = 1,
5048 .amux = LINE1, 5055 .amux = LINE1,
5049 }, { 5056 }, {
5050 .name = name_svideo, 5057 .type = SAA7134_INPUT_SVIDEO,
5051 .vmux = 8, 5058 .vmux = 8,
5052 .amux = LINE1, 5059 .amux = LINE1,
5053 } }, 5060 } },
5054 .radio = { 5061 .radio = {
5055 .name = name_radio, 5062 .type = SAA7134_INPUT_RADIO,
5056 .amux = LINE2, 5063 .amux = LINE2,
5057 }, 5064 },
5058 }, 5065 },
@@ -5067,21 +5074,21 @@ struct saa7134_board saa7134_boards[] = {
5067 .gpiomask = 1 << 21, 5074 .gpiomask = 1 << 21,
5068 .mpeg = SAA7134_MPEG_DVB, 5075 .mpeg = SAA7134_MPEG_DVB,
5069 .inputs = {{ 5076 .inputs = {{
5070 .name = name_tv, 5077 .type = SAA7134_INPUT_TV,
5071 .vmux = 1, 5078 .vmux = 1,
5072 .amux = TV, 5079 .amux = TV,
5073 .tv = 1, 5080 .tv = 1,
5074 }, { 5081 }, {
5075 .name = name_comp, 5082 .type = SAA7134_INPUT_COMPOSITE,
5076 .vmux = 0, 5083 .vmux = 0,
5077 .amux = LINE2, 5084 .amux = LINE2,
5078 }, { 5085 }, {
5079 .name = name_svideo, 5086 .type = SAA7134_INPUT_SVIDEO,
5080 .vmux = 8, 5087 .vmux = 8,
5081 .amux = LINE2, 5088 .amux = LINE2,
5082 } }, 5089 } },
5083 .radio = { 5090 .radio = {
5084 .name = name_radio, 5091 .type = SAA7134_INPUT_RADIO,
5085 .amux = TV, 5092 .amux = TV,
5086 .gpio = 0x0200000, 5093 .gpio = 0x0200000,
5087 }, 5094 },
@@ -5097,21 +5104,21 @@ struct saa7134_board saa7134_boards[] = {
5097 .gpiomask = 1 << 21, 5104 .gpiomask = 1 << 21,
5098 .mpeg = SAA7134_MPEG_DVB, 5105 .mpeg = SAA7134_MPEG_DVB,
5099 .inputs = {{ 5106 .inputs = {{
5100 .name = name_tv, 5107 .type = SAA7134_INPUT_TV,
5101 .vmux = 1, 5108 .vmux = 1,
5102 .amux = TV, 5109 .amux = TV,
5103 .tv = 1, 5110 .tv = 1,
5104 }, { 5111 }, {
5105 .name = name_comp, 5112 .type = SAA7134_INPUT_COMPOSITE,
5106 .vmux = 0, 5113 .vmux = 0,
5107 .amux = LINE2, 5114 .amux = LINE2,
5108 }, { 5115 }, {
5109 .name = name_svideo, 5116 .type = SAA7134_INPUT_SVIDEO,
5110 .vmux = 8, 5117 .vmux = 8,
5111 .amux = LINE2, 5118 .amux = LINE2,
5112 } }, 5119 } },
5113 .radio = { 5120 .radio = {
5114 .name = name_radio, 5121 .type = SAA7134_INPUT_RADIO,
5115 .amux = TV, 5122 .amux = TV,
5116 .gpio = 0x0200000, 5123 .gpio = 0x0200000,
5117 }, 5124 },
@@ -5125,29 +5132,29 @@ struct saa7134_board saa7134_boards[] = {
5125 .radio_addr = ADDR_UNSET, 5132 .radio_addr = ADDR_UNSET,
5126 .gpiomask = 0x801a8087, 5133 .gpiomask = 0x801a8087,
5127 .inputs = { { 5134 .inputs = { {
5128 .name = name_tv, 5135 .type = SAA7134_INPUT_TV,
5129 .vmux = 3, 5136 .vmux = 3,
5130 .amux = LINE2, 5137 .amux = LINE2,
5131 .tv = 1, 5138 .tv = 1,
5132 .gpio = 0x624000, 5139 .gpio = 0x624000,
5133 }, { 5140 }, {
5134 .name = name_comp1, 5141 .type = SAA7134_INPUT_COMPOSITE1,
5135 .vmux = 1, 5142 .vmux = 1,
5136 .amux = LINE1, 5143 .amux = LINE1,
5137 .gpio = 0x624000, 5144 .gpio = 0x624000,
5138 }, { 5145 }, {
5139 .name = name_svideo, 5146 .type = SAA7134_INPUT_SVIDEO,
5140 .vmux = 1, 5147 .vmux = 1,
5141 .amux = LINE1, 5148 .amux = LINE1,
5142 .gpio = 0x624000, 5149 .gpio = 0x624000,
5143 } }, 5150 } },
5144 .radio = { 5151 .radio = {
5145 .name = name_radio, 5152 .type = SAA7134_INPUT_RADIO,
5146 .amux = LINE2, 5153 .amux = LINE2,
5147 .gpio = 0x624001, 5154 .gpio = 0x624001,
5148 }, 5155 },
5149 .mute = { 5156 .mute = {
5150 .name = name_mute, 5157 .type = SAA7134_INPUT_MUTE,
5151 .amux = TV, 5158 .amux = TV,
5152 }, 5159 },
5153 }, 5160 },
@@ -5161,16 +5168,16 @@ struct saa7134_board saa7134_boards[] = {
5161 .tda9887_conf = TDA9887_PRESENT, 5168 .tda9887_conf = TDA9887_PRESENT,
5162 .mpeg = SAA7134_MPEG_DVB, 5169 .mpeg = SAA7134_MPEG_DVB,
5163 .inputs = { { 5170 .inputs = { {
5164 .name = name_tv, 5171 .type = SAA7134_INPUT_TV,
5165 .vmux = 1, 5172 .vmux = 1,
5166 .amux = TV, 5173 .amux = TV,
5167 .tv = 1, 5174 .tv = 1,
5168 }, { 5175 }, {
5169 .name = name_comp, 5176 .type = SAA7134_INPUT_COMPOSITE,
5170 .vmux = 4, 5177 .vmux = 4,
5171 .amux = LINE1, 5178 .amux = LINE1,
5172 }, { 5179 }, {
5173 .name = name_svideo, 5180 .type = SAA7134_INPUT_SVIDEO,
5174 .vmux = 8, 5181 .vmux = 8,
5175 .amux = LINE1, 5182 .amux = LINE1,
5176 } }, 5183 } },
@@ -5186,25 +5193,25 @@ struct saa7134_board saa7134_boards[] = {
5186 .mpeg = SAA7134_MPEG_DVB, 5193 .mpeg = SAA7134_MPEG_DVB,
5187 .gpiomask = 0x0200000, 5194 .gpiomask = 0x0200000,
5188 .inputs = { { 5195 .inputs = { {
5189 .name = name_tv, 5196 .type = SAA7134_INPUT_TV,
5190 .vmux = 1, 5197 .vmux = 1,
5191 .amux = TV, 5198 .amux = TV,
5192 .tv = 1, 5199 .tv = 1,
5193 }, { 5200 }, {
5194 .name = name_comp1, 5201 .type = SAA7134_INPUT_COMPOSITE1,
5195 .vmux = 3, 5202 .vmux = 3,
5196 .amux = LINE2, 5203 .amux = LINE2,
5197 }, { 5204 }, {
5198 .name = name_comp2, 5205 .type = SAA7134_INPUT_COMPOSITE2,
5199 .vmux = 0, 5206 .vmux = 0,
5200 .amux = LINE2, 5207 .amux = LINE2,
5201 }, { 5208 }, {
5202 .name = name_svideo, 5209 .type = SAA7134_INPUT_SVIDEO,
5203 .vmux = 8, 5210 .vmux = 8,
5204 .amux = LINE2, 5211 .amux = LINE2,
5205 } }, 5212 } },
5206 .radio = { 5213 .radio = {
5207 .name = name_radio, 5214 .type = SAA7134_INPUT_RADIO,
5208 .amux = TV, 5215 .amux = TV,
5209 .gpio = 0x0200000, 5216 .gpio = 0x0200000,
5210 }, 5217 },
@@ -5218,30 +5225,30 @@ struct saa7134_board saa7134_boards[] = {
5218 .radio_addr = 0x60, 5225 .radio_addr = 0x60,
5219 .gpiomask = 0x80000700, 5226 .gpiomask = 0x80000700,
5220 .inputs = { { 5227 .inputs = { {
5221 .name = name_tv, 5228 .type = SAA7134_INPUT_TV,
5222 .vmux = 1, 5229 .vmux = 1,
5223 .amux = LINE2, 5230 .amux = LINE2,
5224 .tv = 1, 5231 .tv = 1,
5225 .gpio = 0x100, 5232 .gpio = 0x100,
5226 }, { 5233 }, {
5227 .name = name_comp1, 5234 .type = SAA7134_INPUT_COMPOSITE1,
5228 .vmux = 3, 5235 .vmux = 3,
5229 .amux = LINE1, 5236 .amux = LINE1,
5230 .gpio = 0x200, 5237 .gpio = 0x200,
5231 }, { 5238 }, {
5232 .name = name_svideo, 5239 .type = SAA7134_INPUT_SVIDEO,
5233 .vmux = 8, 5240 .vmux = 8,
5234 .amux = LINE1, 5241 .amux = LINE1,
5235 .gpio = 0x200, 5242 .gpio = 0x200,
5236 } }, 5243 } },
5237 .radio = { 5244 .radio = {
5238 .name = name_radio, 5245 .type = SAA7134_INPUT_RADIO,
5239 .vmux = 1, 5246 .vmux = 1,
5240 .amux = LINE1, 5247 .amux = LINE1,
5241 .gpio = 0x100, 5248 .gpio = 0x100,
5242 }, 5249 },
5243 .mute = { 5250 .mute = {
5244 .name = name_mute, 5251 .type = SAA7134_INPUT_MUTE,
5245 .vmux = 8, 5252 .vmux = 8,
5246 .amux = 2, 5253 .amux = 2,
5247 }, 5254 },
@@ -5257,18 +5264,18 @@ struct saa7134_board saa7134_boards[] = {
5257 .mpeg = SAA7134_MPEG_DVB, 5264 .mpeg = SAA7134_MPEG_DVB,
5258 .ts_type = SAA7134_MPEG_TS_PARALLEL, 5265 .ts_type = SAA7134_MPEG_TS_PARALLEL,
5259 .inputs = { { 5266 .inputs = { {
5260 .name = name_tv, 5267 .type = SAA7134_INPUT_TV,
5261 .vmux = 1, 5268 .vmux = 1,
5262 .amux = TV, 5269 .amux = TV,
5263 .tv = 1, 5270 .tv = 1,
5264#if 0 /* FIXME */ 5271#if 0 /* FIXME */
5265 }, { 5272 }, {
5266 .name = name_comp1, 5273 .type = SAA7134_INPUT_COMPOSITE1,
5267 .vmux = 3, 5274 .vmux = 3,
5268 .amux = LINE1, 5275 .amux = LINE1,
5269 .gpio = 0x200, 5276 .gpio = 0x200,
5270 }, { 5277 }, {
5271 .name = name_svideo, 5278 .type = SAA7134_INPUT_SVIDEO,
5272 .vmux = 8, 5279 .vmux = 8,
5273 .amux = LINE1, 5280 .amux = LINE1,
5274 .gpio = 0x200, 5281 .gpio = 0x200,
@@ -5276,14 +5283,14 @@ struct saa7134_board saa7134_boards[] = {
5276 } }, 5283 } },
5277#if 0 5284#if 0
5278 .radio = { 5285 .radio = {
5279 .name = name_radio, 5286 .type = SAA7134_INPUT_RADIO,
5280 .vmux = 1, 5287 .vmux = 1,
5281 .amux = LINE1, 5288 .amux = LINE1,
5282 .gpio = 0x100, 5289 .gpio = 0x100,
5283 }, 5290 },
5284#endif 5291#endif
5285 .mute = { 5292 .mute = {
5286 .name = name_mute, 5293 .type = SAA7134_INPUT_MUTE,
5287 .vmux = 0, 5294 .vmux = 0,
5288 .amux = TV, 5295 .amux = TV,
5289 }, 5296 },
@@ -5298,24 +5305,24 @@ struct saa7134_board saa7134_boards[] = {
5298 .gpiomask = 0x00300003, 5305 .gpiomask = 0x00300003,
5299 /* .gpiomask = 0x8c240003, */ 5306 /* .gpiomask = 0x8c240003, */
5300 .inputs = { { 5307 .inputs = { {
5301 .name = name_tv, 5308 .type = SAA7134_INPUT_TV,
5302 .vmux = 1, 5309 .vmux = 1,
5303 .amux = TV, 5310 .amux = TV,
5304 .tv = 1, 5311 .tv = 1,
5305 .gpio = 0x01, 5312 .gpio = 0x01,
5306 }, { 5313 }, {
5307 .name = name_svideo, 5314 .type = SAA7134_INPUT_SVIDEO,
5308 .vmux = 6, 5315 .vmux = 6,
5309 .amux = LINE1, 5316 .amux = LINE1,
5310 .gpio = 0x02, 5317 .gpio = 0x02,
5311 } }, 5318 } },
5312 .radio = { 5319 .radio = {
5313 .name = name_radio, 5320 .type = SAA7134_INPUT_RADIO,
5314 .amux = TV, 5321 .amux = TV,
5315 .gpio = 0x00300001, 5322 .gpio = 0x00300001,
5316 }, 5323 },
5317 .mute = { 5324 .mute = {
5318 .name = name_mute, 5325 .type = SAA7134_INPUT_MUTE,
5319 .amux = TV, 5326 .amux = TV,
5320 .gpio = 0x01, 5327 .gpio = 0x01,
5321 }, 5328 },
@@ -5331,29 +5338,29 @@ struct saa7134_board saa7134_boards[] = {
5331 .tda9887_conf = TDA9887_PRESENT, 5338 .tda9887_conf = TDA9887_PRESENT,
5332 .gpiomask = 0x03, 5339 .gpiomask = 0x03,
5333 .inputs = { { 5340 .inputs = { {
5334 .name = name_tv, 5341 .type = SAA7134_INPUT_TV,
5335 .vmux = 1, 5342 .vmux = 1,
5336 .amux = TV, 5343 .amux = TV,
5337 .tv = 1, 5344 .tv = 1,
5338 .gpio = 0x00, 5345 .gpio = 0x00,
5339 }, { 5346 }, {
5340 .name = name_comp1, 5347 .type = SAA7134_INPUT_COMPOSITE1,
5341 .vmux = 3, 5348 .vmux = 3,
5342 .amux = LINE1, 5349 .amux = LINE1,
5343 .gpio = 0x00, 5350 .gpio = 0x00,
5344 }, { 5351 }, {
5345 .name = name_svideo, 5352 .type = SAA7134_INPUT_SVIDEO,
5346 .vmux = 8, 5353 .vmux = 8,
5347 .amux = LINE1, 5354 .amux = LINE1,
5348 .gpio = 0x00, 5355 .gpio = 0x00,
5349 } }, 5356 } },
5350 .radio = { 5357 .radio = {
5351 .name = name_radio, 5358 .type = SAA7134_INPUT_RADIO,
5352 .amux = LINE2, 5359 .amux = LINE2,
5353 .gpio = 0x01, 5360 .gpio = 0x01,
5354 }, 5361 },
5355 .mute = { 5362 .mute = {
5356 .name = name_mute, 5363 .type = SAA7134_INPUT_MUTE,
5357 .amux = LINE1, 5364 .amux = LINE1,
5358 .gpio = 0x00, 5365 .gpio = 0x00,
5359 }, 5366 },
@@ -5368,11 +5375,11 @@ struct saa7134_board saa7134_boards[] = {
5368 .radio_addr = ADDR_UNSET, 5375 .radio_addr = ADDR_UNSET,
5369 .mpeg = SAA7134_MPEG_DVB, 5376 .mpeg = SAA7134_MPEG_DVB,
5370 .inputs = { { 5377 .inputs = { {
5371 .name = name_comp1, 5378 .type = SAA7134_INPUT_COMPOSITE1,
5372 .vmux = 0, 5379 .vmux = 0,
5373 .amux = LINE1, 5380 .amux = LINE1,
5374 }, { 5381 }, {
5375 .name = name_svideo, 5382 .type = SAA7134_INPUT_SVIDEO,
5376 .vmux = 8, /* Not tested */ 5383 .vmux = 8, /* Not tested */
5377 .amux = LINE1 5384 .amux = LINE1
5378 } }, 5385 } },
@@ -5387,21 +5394,21 @@ struct saa7134_board saa7134_boards[] = {
5387 .radio_addr = ADDR_UNSET, 5394 .radio_addr = ADDR_UNSET,
5388 .mpeg = SAA7134_MPEG_DVB, 5395 .mpeg = SAA7134_MPEG_DVB,
5389 .inputs = { { 5396 .inputs = { {
5390 .name = name_tv, 5397 .type = SAA7134_INPUT_TV,
5391 .vmux = 2, 5398 .vmux = 2,
5392 .amux = TV, 5399 .amux = TV,
5393 .tv = 1, 5400 .tv = 1,
5394 }, { 5401 }, {
5395 .name = name_comp1, 5402 .type = SAA7134_INPUT_COMPOSITE1,
5396 .vmux = 0, 5403 .vmux = 0,
5397 .amux = LINE1, 5404 .amux = LINE1,
5398 }, { 5405 }, {
5399 .name = name_svideo, 5406 .type = SAA7134_INPUT_SVIDEO,
5400 .vmux = 9, 5407 .vmux = 9,
5401 .amux = LINE1, 5408 .amux = LINE1,
5402 } }, 5409 } },
5403 .radio = { 5410 .radio = {
5404 .name = name_radio, 5411 .type = SAA7134_INPUT_RADIO,
5405 .amux = TV, 5412 .amux = TV,
5406 }, 5413 },
5407 }, 5414 },
@@ -5416,13 +5423,13 @@ struct saa7134_board saa7134_boards[] = {
5416 .mpeg = SAA7134_MPEG_DVB, 5423 .mpeg = SAA7134_MPEG_DVB,
5417 .ts_type = SAA7134_MPEG_TS_PARALLEL, 5424 .ts_type = SAA7134_MPEG_TS_PARALLEL,
5418 .inputs = {{ 5425 .inputs = {{
5419 .name = name_tv, 5426 .type = SAA7134_INPUT_TV,
5420 .vmux = 1, 5427 .vmux = 1,
5421 .amux = TV, 5428 .amux = TV,
5422 .tv = 1, 5429 .tv = 1,
5423 } }, 5430 } },
5424 .radio = { /* untested */ 5431 .radio = { /* untested */
5425 .name = name_radio, 5432 .type = SAA7134_INPUT_RADIO,
5426 .amux = TV, 5433 .amux = TV,
5427 }, 5434 },
5428 }, 5435 },
@@ -5436,16 +5443,16 @@ struct saa7134_board saa7134_boards[] = {
5436 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, 5443 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
5437 .mpeg = SAA7134_MPEG_DVB, 5444 .mpeg = SAA7134_MPEG_DVB,
5438 .inputs = { { 5445 .inputs = { {
5439 .name = name_tv, 5446 .type = SAA7134_INPUT_TV,
5440 .vmux = 3, 5447 .vmux = 3,
5441 .amux = TV, 5448 .amux = TV,
5442 .tv = 1, 5449 .tv = 1,
5443 }, { 5450 }, {
5444 .name = name_comp1, 5451 .type = SAA7134_INPUT_COMPOSITE1,
5445 .vmux = 4, 5452 .vmux = 4,
5446 .amux = LINE2, 5453 .amux = LINE2,
5447 }, { 5454 }, {
5448 .name = name_svideo, 5455 .type = SAA7134_INPUT_SVIDEO,
5449 .vmux = 8, 5456 .vmux = 8,
5450 .amux = LINE2, 5457 .amux = LINE2,
5451 } }, 5458 } },
@@ -5459,10 +5466,10 @@ struct saa7134_board saa7134_boards[] = {
5459 .radio_addr = ADDR_UNSET, 5466 .radio_addr = ADDR_UNSET,
5460 .mpeg = SAA7134_MPEG_DVB, 5467 .mpeg = SAA7134_MPEG_DVB,
5461 .inputs = { { 5468 .inputs = { {
5462 .name = name_comp1, 5469 .type = SAA7134_INPUT_COMPOSITE1,
5463 .vmux = 3, 5470 .vmux = 3,
5464 }, { 5471 }, {
5465 .name = name_svideo, 5472 .type = SAA7134_INPUT_SVIDEO,
5466 .vmux = 8, 5473 .vmux = 8,
5467 } }, 5474 } },
5468 }, 5475 },
@@ -5479,25 +5486,25 @@ struct saa7134_board saa7134_boards[] = {
5479 .tda9887_conf = TDA9887_PRESENT, 5486 .tda9887_conf = TDA9887_PRESENT,
5480 .gpiomask = 0x00008000, 5487 .gpiomask = 0x00008000,
5481 .inputs = {{ 5488 .inputs = {{
5482 .name = name_tv, 5489 .type = SAA7134_INPUT_TV,
5483 .vmux = 3, 5490 .vmux = 3,
5484 .amux = LINE2, 5491 .amux = LINE2,
5485 .tv = 1, 5492 .tv = 1,
5486 }, { 5493 }, {
5487 .name = name_comp1, 5494 .type = SAA7134_INPUT_COMPOSITE1,
5488 .vmux = 1, 5495 .vmux = 1,
5489 .amux = LINE1, 5496 .amux = LINE1,
5490 }, { 5497 }, {
5491 .name = name_svideo, 5498 .type = SAA7134_INPUT_SVIDEO,
5492 .vmux = 8, 5499 .vmux = 8,
5493 .amux = LINE1, 5500 .amux = LINE1,
5494 } }, 5501 } },
5495 .mute = { 5502 .mute = {
5496 .name = name_mute, 5503 .type = SAA7134_INPUT_MUTE,
5497 .amux = LINE1, 5504 .amux = LINE1,
5498 }, 5505 },
5499 .radio = { 5506 .radio = {
5500 .name = name_radio, 5507 .type = SAA7134_INPUT_RADIO,
5501 .amux = LINE2, 5508 .amux = LINE2,
5502 }, 5509 },
5503 }, 5510 },
@@ -5512,7 +5519,7 @@ struct saa7134_board saa7134_boards[] = {
5512 .radio_addr = ADDR_UNSET, 5519 .radio_addr = ADDR_UNSET,
5513 .gpiomask = 0x389c00, 5520 .gpiomask = 0x389c00,
5514 .inputs = {{ 5521 .inputs = {{
5515 .name = name_comp1, 5522 .type = SAA7134_INPUT_COMPOSITE1,
5516 .vmux = 3, 5523 .vmux = 3,
5517 .amux = LINE1, 5524 .amux = LINE1,
5518 .gpio = 0x01fc00, 5525 .gpio = 0x01fc00,
@@ -5529,21 +5536,21 @@ struct saa7134_board saa7134_boards[] = {
5529 .mpeg = SAA7134_MPEG_DVB, 5536 .mpeg = SAA7134_MPEG_DVB,
5530 .ts_type = SAA7134_MPEG_TS_PARALLEL, 5537 .ts_type = SAA7134_MPEG_TS_PARALLEL,
5531 .inputs = { { 5538 .inputs = { {
5532 .name = name_tv, 5539 .type = SAA7134_INPUT_TV,
5533 .vmux = 2, 5540 .vmux = 2,
5534 .amux = TV, 5541 .amux = TV,
5535 .tv = 1, 5542 .tv = 1,
5536 }, { 5543 }, {
5537 .name = name_comp1, 5544 .type = SAA7134_INPUT_COMPOSITE1,
5538 .vmux = 0, 5545 .vmux = 0,
5539 .amux = LINE1, 5546 .amux = LINE1,
5540 }, { 5547 }, {
5541 .name = name_svideo, 5548 .type = SAA7134_INPUT_SVIDEO,
5542 .vmux = 9, 5549 .vmux = 9,
5543 .amux = LINE1, 5550 .amux = LINE1,
5544 } }, 5551 } },
5545 .radio = { 5552 .radio = {
5546 .name = name_radio, 5553 .type = SAA7134_INPUT_RADIO,
5547 .amux = TV, 5554 .amux = TV,
5548 }, 5555 },
5549 }, 5556 },
@@ -5556,21 +5563,21 @@ struct saa7134_board saa7134_boards[] = {
5556 .tuner_addr = ADDR_UNSET, 5563 .tuner_addr = ADDR_UNSET,
5557 .radio_addr = ADDR_UNSET, 5564 .radio_addr = ADDR_UNSET,
5558 .inputs = { { 5565 .inputs = { {
5559 .name = name_tv, 5566 .type = SAA7134_INPUT_TV,
5560 .vmux = 2, 5567 .vmux = 2,
5561 .amux = TV, 5568 .amux = TV,
5562 .tv = 1, 5569 .tv = 1,
5563 }, { 5570 }, {
5564 .name = name_comp1, 5571 .type = SAA7134_INPUT_COMPOSITE1,
5565 .vmux = 0, 5572 .vmux = 0,
5566 .amux = LINE1, 5573 .amux = LINE1,
5567 }, { 5574 }, {
5568 .name = name_svideo, 5575 .type = SAA7134_INPUT_SVIDEO,
5569 .vmux = 9, 5576 .vmux = 9,
5570 .amux = LINE1, 5577 .amux = LINE1,
5571 } }, 5578 } },
5572 .radio = { 5579 .radio = {
5573 .name = name_radio, 5580 .type = SAA7134_INPUT_RADIO,
5574 .amux = TV, 5581 .amux = TV,
5575 }, 5582 },
5576 }, 5583 },
@@ -5584,16 +5591,16 @@ struct saa7134_board saa7134_boards[] = {
5584 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE, 5591 .tda9887_conf = TDA9887_PRESENT | TDA9887_PORT1_ACTIVE,
5585 .mpeg = SAA7134_MPEG_DVB, 5592 .mpeg = SAA7134_MPEG_DVB,
5586 .inputs = {{ 5593 .inputs = {{
5587 .name = name_tv, 5594 .type = SAA7134_INPUT_TV,
5588 .vmux = 3, 5595 .vmux = 3,
5589 .amux = TV, 5596 .amux = TV,
5590 .tv = 1, 5597 .tv = 1,
5591 }, { 5598 }, {
5592 .name = name_comp1, 5599 .type = SAA7134_INPUT_COMPOSITE1,
5593 .vmux = 0, 5600 .vmux = 0,
5594 .amux = LINE2, 5601 .amux = LINE2,
5595 }, { 5602 }, {
5596 .name = name_svideo, 5603 .type = SAA7134_INPUT_SVIDEO,
5597 .vmux = 8, 5604 .vmux = 8,
5598 .amux = LINE2, 5605 .amux = LINE2,
5599 } }, 5606 } },
@@ -5607,25 +5614,25 @@ struct saa7134_board saa7134_boards[] = {
5607 .tuner_addr = ADDR_UNSET, 5614 .tuner_addr = ADDR_UNSET,
5608 .radio_addr = 0x60, 5615 .radio_addr = 0x60,
5609 .inputs = { { 5616 .inputs = { {
5610 .name = name_tv, 5617 .type = SAA7134_INPUT_TV,
5611 .vmux = 1, 5618 .vmux = 1,
5612 .amux = TV, 5619 .amux = TV,
5613 .tv = 1, 5620 .tv = 1,
5614 }, { 5621 }, {
5615 .name = name_comp1, 5622 .type = SAA7134_INPUT_COMPOSITE1,
5616 .vmux = 3, 5623 .vmux = 3,
5617 .amux = LINE2, 5624 .amux = LINE2,
5618 }, { 5625 }, {
5619 .name = name_svideo, 5626 .type = SAA7134_INPUT_SVIDEO,
5620 .vmux = 8, 5627 .vmux = 8,
5621 .amux = LINE2, 5628 .amux = LINE2,
5622 } }, 5629 } },
5623 .radio = { 5630 .radio = {
5624 .name = name_radio, 5631 .type = SAA7134_INPUT_RADIO,
5625 .amux = LINE1, 5632 .amux = LINE1,
5626 }, 5633 },
5627 .mute = { 5634 .mute = {
5628 .name = name_mute, 5635 .type = SAA7134_INPUT_MUTE,
5629 .amux = TV, 5636 .amux = TV,
5630 }, 5637 },
5631 }, 5638 },
@@ -5642,29 +5649,29 @@ struct saa7134_board saa7134_boards[] = {
5642 .mpeg = SAA7134_MPEG_DVB, 5649 .mpeg = SAA7134_MPEG_DVB,
5643 .ts_type = SAA7134_MPEG_TS_PARALLEL, 5650 .ts_type = SAA7134_MPEG_TS_PARALLEL,
5644 .inputs = { { 5651 .inputs = { {
5645 .name = name_tv, 5652 .type = SAA7134_INPUT_TV,
5646 .vmux = 1, 5653 .vmux = 1,
5647 .amux = TV, 5654 .amux = TV,
5648 .tv = 1, 5655 .tv = 1,
5649 .gpio = 0x00050000, 5656 .gpio = 0x00050000,
5650 }, { 5657 }, {
5651 .name = name_comp1, 5658 .type = SAA7134_INPUT_COMPOSITE1,
5652 .vmux = 3, 5659 .vmux = 3,
5653 .amux = LINE1, 5660 .amux = LINE1,
5654 .gpio = 0x00050000, 5661 .gpio = 0x00050000,
5655 }, { 5662 }, {
5656 .name = name_svideo, 5663 .type = SAA7134_INPUT_SVIDEO,
5657 .vmux = 8, 5664 .vmux = 8,
5658 .amux = LINE1, 5665 .amux = LINE1,
5659 .gpio = 0x00050000, 5666 .gpio = 0x00050000,
5660 } }, 5667 } },
5661 .radio = { 5668 .radio = {
5662 .name = name_radio, 5669 .type = SAA7134_INPUT_RADIO,
5663 .amux = TV, 5670 .amux = TV,
5664 .gpio = 0x00050000, 5671 .gpio = 0x00050000,
5665 }, 5672 },
5666 .mute = { 5673 .mute = {
5667 .name = name_mute, 5674 .type = SAA7134_INPUT_MUTE,
5668 .vmux = 0, 5675 .vmux = 0,
5669 .amux = TV, 5676 .amux = TV,
5670 .gpio = 0x00050000, 5677 .gpio = 0x00050000,
@@ -5681,21 +5688,21 @@ struct saa7134_board saa7134_boards[] = {
5681 .radio_addr = ADDR_UNSET, 5688 .radio_addr = ADDR_UNSET,
5682 .gpiomask = 0x00008000, 5689 .gpiomask = 0x00008000,
5683 .inputs = { { 5690 .inputs = { {
5684 .name = name_tv, 5691 .type = SAA7134_INPUT_TV,
5685 .vmux = 3, 5692 .vmux = 3,
5686 .amux = LINE2, 5693 .amux = LINE2,
5687 .tv = 1, 5694 .tv = 1,
5688 }, { 5695 }, {
5689 .name = name_comp1, 5696 .type = SAA7134_INPUT_COMPOSITE1,
5690 .vmux = 1, 5697 .vmux = 1,
5691 .amux = LINE1, 5698 .amux = LINE1,
5692 }, { 5699 }, {
5693 .name = name_svideo, 5700 .type = SAA7134_INPUT_SVIDEO,
5694 .vmux = 8, 5701 .vmux = 8,
5695 .amux = LINE1, 5702 .amux = LINE1,
5696 } }, 5703 } },
5697 .mute = { 5704 .mute = {
5698 .name = name_mute, 5705 .type = SAA7134_INPUT_MUTE,
5699 .amux = LINE1, 5706 .amux = LINE1,
5700 }, 5707 },
5701 }, 5708 },
@@ -5710,21 +5717,21 @@ struct saa7134_board saa7134_boards[] = {
5710 .radio_addr = ADDR_UNSET, 5717 .radio_addr = ADDR_UNSET,
5711 .gpiomask = 0x00008000, 5718 .gpiomask = 0x00008000,
5712 .inputs = { { 5719 .inputs = { {
5713 .name = name_tv, 5720 .type = SAA7134_INPUT_TV,
5714 .vmux = 3, 5721 .vmux = 3,
5715 .amux = LINE2, 5722 .amux = LINE2,
5716 .tv = 1, 5723 .tv = 1,
5717 }, { 5724 }, {
5718 .name = name_comp1, 5725 .type = SAA7134_INPUT_COMPOSITE1,
5719 .vmux = 1, 5726 .vmux = 1,
5720 .amux = LINE1, 5727 .amux = LINE1,
5721 }, { 5728 }, {
5722 .name = name_svideo, 5729 .type = SAA7134_INPUT_SVIDEO,
5723 .vmux = 8, 5730 .vmux = 8,
5724 .amux = LINE1, 5731 .amux = LINE1,
5725 } }, 5732 } },
5726 .mute = { 5733 .mute = {
5727 .name = name_mute, 5734 .type = SAA7134_INPUT_MUTE,
5728 .amux = LINE1, 5735 .amux = LINE1,
5729 }, 5736 },
5730 }, 5737 },
@@ -5736,15 +5743,15 @@ struct saa7134_board saa7134_boards[] = {
5736 .tuner_addr = ADDR_UNSET, 5743 .tuner_addr = ADDR_UNSET,
5737 .radio_addr = ADDR_UNSET, 5744 .radio_addr = ADDR_UNSET,
5738 .inputs = {{ 5745 .inputs = {{
5739 .name = name_comp1, 5746 .type = SAA7134_INPUT_COMPOSITE1,
5740 .vmux = 0, 5747 .vmux = 0,
5741 .amux = LINE1, 5748 .amux = LINE1,
5742 }, { 5749 }, {
5743 .name = name_comp3, 5750 .type = SAA7134_INPUT_COMPOSITE3,
5744 .vmux = 2, 5751 .vmux = 2,
5745 .amux = LINE1, 5752 .amux = LINE1,
5746 }, { 5753 }, {
5747 .name = name_svideo, 5754 .type = SAA7134_INPUT_SVIDEO,
5748 .vmux = 8, 5755 .vmux = 8,
5749 .amux = LINE1, 5756 .amux = LINE1,
5750 } }, 5757 } },
@@ -5760,21 +5767,21 @@ struct saa7134_board saa7134_boards[] = {
5760 .gpiomask = 1 << 21, 5767 .gpiomask = 1 << 21,
5761 .ts_type = SAA7134_MPEG_TS_PARALLEL, 5768 .ts_type = SAA7134_MPEG_TS_PARALLEL,
5762 .inputs = { { 5769 .inputs = { {
5763 .name = name_tv, 5770 .type = SAA7134_INPUT_TV,
5764 .vmux = 1, 5771 .vmux = 1,
5765 .amux = TV, 5772 .amux = TV,
5766 .tv = 1, 5773 .tv = 1,
5767 }, { 5774 }, {
5768 .name = name_comp, 5775 .type = SAA7134_INPUT_COMPOSITE,
5769 .vmux = 3, 5776 .vmux = 3,
5770 .amux = LINE1, 5777 .amux = LINE1,
5771 }, { 5778 }, {
5772 .name = name_svideo, 5779 .type = SAA7134_INPUT_SVIDEO,
5773 .vmux = 8, 5780 .vmux = 8,
5774 .amux = LINE2, 5781 .amux = LINE2,
5775 } }, 5782 } },
5776 .radio = { 5783 .radio = {
5777 .name = name_radio, 5784 .type = SAA7134_INPUT_RADIO,
5778 .amux = TV, 5785 .amux = TV,
5779 .gpio = 0x0000000, 5786 .gpio = 0x0000000,
5780 }, 5787 },
@@ -5790,7 +5797,7 @@ struct saa7134_board saa7134_boards[] = {
5790 .radio_addr = ADDR_UNSET, 5797 .radio_addr = ADDR_UNSET,
5791 .gpiomask = 0x618E700, 5798 .gpiomask = 0x618E700,
5792 .inputs = {{ 5799 .inputs = {{
5793 .name = name_comp1, 5800 .type = SAA7134_INPUT_COMPOSITE1,
5794 .vmux = 3, 5801 .vmux = 3,
5795 .amux = LINE1, 5802 .amux = LINE1,
5796 .gpio = 0x6010000, 5803 .gpio = 0x6010000,
@@ -5809,21 +5816,21 @@ struct saa7134_board saa7134_boards[] = {
5809 .gpiomask = 1 << 11, 5816 .gpiomask = 1 << 11,
5810 .mpeg = SAA7134_MPEG_DVB, 5817 .mpeg = SAA7134_MPEG_DVB,
5811 .inputs = {{ 5818 .inputs = {{
5812 .name = name_tv, 5819 .type = SAA7134_INPUT_TV,
5813 .vmux = 1, 5820 .vmux = 1,
5814 .amux = TV, 5821 .amux = TV,
5815 .tv = 1, 5822 .tv = 1,
5816 }, { 5823 }, {
5817 .name = name_comp, 5824 .type = SAA7134_INPUT_COMPOSITE,
5818 .vmux = 4, 5825 .vmux = 4,
5819 .amux = LINE1, 5826 .amux = LINE1,
5820 }, { 5827 }, {
5821 .name = name_svideo, 5828 .type = SAA7134_INPUT_SVIDEO,
5822 .vmux = 8, 5829 .vmux = 8,
5823 .amux = LINE1, 5830 .amux = LINE1,
5824 } }, 5831 } },
5825 .radio = { 5832 .radio = {
5826 .name = name_radio, 5833 .type = SAA7134_INPUT_RADIO,
5827 .amux = TV, 5834 .amux = TV,
5828 .gpio = 0x0000800, 5835 .gpio = 0x0000800,
5829 }, 5836 },
@@ -5837,16 +5844,16 @@ struct saa7134_board saa7134_boards[] = {
5837 .radio_addr = ADDR_UNSET, 5844 .radio_addr = ADDR_UNSET,
5838 .mpeg = SAA7134_MPEG_GO7007, 5845 .mpeg = SAA7134_MPEG_GO7007,
5839 .inputs = { { 5846 .inputs = { {
5840 .name = name_comp1, 5847 .type = SAA7134_INPUT_COMPOSITE1,
5841 .vmux = 0, 5848 .vmux = 0,
5842 .amux = LINE2, 5849 .amux = LINE2,
5843 }, { 5850 }, {
5844 .name = name_tv, 5851 .type = SAA7134_INPUT_TV,
5845 .vmux = 3, 5852 .vmux = 3,
5846 .amux = TV, 5853 .amux = TV,
5847 .tv = 1, 5854 .tv = 1,
5848 }, { 5855 }, {
5849 .name = name_svideo, 5856 .type = SAA7134_INPUT_SVIDEO,
5850 .vmux = 6, 5857 .vmux = 6,
5851 .amux = LINE1, 5858 .amux = LINE1,
5852 } }, 5859 } },
@@ -5862,25 +5869,25 @@ struct saa7134_board saa7134_boards[] = {
5862 .radio_addr = ADDR_UNSET, 5869 .radio_addr = ADDR_UNSET,
5863 .tda9887_conf = TDA9887_PRESENT, 5870 .tda9887_conf = TDA9887_PRESENT,
5864 .inputs = {{ 5871 .inputs = {{
5865 .name = name_tv, 5872 .type = SAA7134_INPUT_TV,
5866 .vmux = 1, 5873 .vmux = 1,
5867 .amux = LINE2, 5874 .amux = LINE2,
5868 .tv = 1, 5875 .tv = 1,
5869 }, { 5876 }, {
5870 .name = name_comp1, 5877 .type = SAA7134_INPUT_COMPOSITE1,
5871 .vmux = 0, 5878 .vmux = 0,
5872 .amux = LINE2, 5879 .amux = LINE2,
5873 }, { 5880 }, {
5874 .name = name_comp2, 5881 .type = SAA7134_INPUT_COMPOSITE2,
5875 .vmux = 3, 5882 .vmux = 3,
5876 .amux = LINE2, 5883 .amux = LINE2,
5877 }, { 5884 }, {
5878 .name = name_svideo, 5885 .type = SAA7134_INPUT_SVIDEO,
5879 .vmux = 8, 5886 .vmux = 8,
5880 .amux = LINE2, 5887 .amux = LINE2,
5881 } }, 5888 } },
5882 .mute = { 5889 .mute = {
5883 .name = name_mute, 5890 .type = SAA7134_INPUT_MUTE,
5884 .amux = LINE1, 5891 .amux = LINE1,
5885 }, 5892 },
5886 }, 5893 },
@@ -5893,29 +5900,29 @@ struct saa7134_board saa7134_boards[] = {
5893 .radio_addr = ADDR_UNSET, 5900 .radio_addr = ADDR_UNSET,
5894 .gpiomask = 0x0d, 5901 .gpiomask = 0x0d,
5895 .inputs = {{ 5902 .inputs = {{
5896 .name = name_tv_mono, 5903 .type = SAA7134_INPUT_TV_MONO,
5897 .vmux = 1, 5904 .vmux = 1,
5898 .amux = LINE1, 5905 .amux = LINE1,
5899 .gpio = 0x00, 5906 .gpio = 0x00,
5900 .tv = 1, 5907 .tv = 1,
5901 }, { 5908 }, {
5902 .name = name_comp1, 5909 .type = SAA7134_INPUT_COMPOSITE1,
5903 .vmux = 3, 5910 .vmux = 3,
5904 .amux = LINE2, 5911 .amux = LINE2,
5905 .gpio = 0x08, 5912 .gpio = 0x08,
5906 }, { 5913 }, {
5907 .name = name_svideo, 5914 .type = SAA7134_INPUT_SVIDEO,
5908 .vmux = 8, 5915 .vmux = 8,
5909 .amux = LINE2, 5916 .amux = LINE2,
5910 .gpio = 0x08, 5917 .gpio = 0x08,
5911 } }, 5918 } },
5912 .radio = { 5919 .radio = {
5913 .name = name_radio, 5920 .type = SAA7134_INPUT_RADIO,
5914 .amux = LINE1, 5921 .amux = LINE1,
5915 .gpio = 0x04, 5922 .gpio = 0x04,
5916 }, 5923 },
5917 .mute = { 5924 .mute = {
5918 .name = name_mute, 5925 .type = SAA7134_INPUT_MUTE,
5919 .amux = LINE1, 5926 .amux = LINE1,
5920 .gpio = 0x08, 5927 .gpio = 0x08,
5921 }, 5928 },
diff --git a/drivers/media/pci/saa7134/saa7134-core.c b/drivers/media/pci/saa7134/saa7134-core.c
index e227b02cc122..31048f9b516a 100644
--- a/drivers/media/pci/saa7134/saa7134-core.c
+++ b/drivers/media/pci/saa7134/saa7134-core.c
@@ -112,7 +112,7 @@ int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
112 printk(KERN_DEBUG pr_fmt("irq: " fmt), ## arg); \ 112 printk(KERN_DEBUG pr_fmt("irq: " fmt), ## arg); \
113 } while (0) 113 } while (0)
114 114
115void saa7134_track_gpio(struct saa7134_dev *dev, char *msg) 115void saa7134_track_gpio(struct saa7134_dev *dev, const char *msg)
116{ 116{
117 unsigned long mode,status; 117 unsigned long mode,status;
118 118
diff --git a/drivers/media/pci/saa7134/saa7134-tvaudio.c b/drivers/media/pci/saa7134/saa7134-tvaudio.c
index 21a579309575..38f94b742e28 100644
--- a/drivers/media/pci/saa7134/saa7134-tvaudio.c
+++ b/drivers/media/pci/saa7134/saa7134-tvaudio.c
@@ -192,7 +192,7 @@ static void mute_input_7134(struct saa7134_dev *dev)
192 in = dev->input; 192 in = dev->input;
193 mute = (dev->ctl_mute || 193 mute = (dev->ctl_mute ||
194 (dev->automute && (&card(dev).radio) != in)); 194 (dev->automute && (&card(dev).radio) != in));
195 if (card(dev).mute.name) { 195 if (card(dev).mute.type) {
196 /* 196 /*
197 * 7130 - we'll mute using some unconnected audio input 197 * 7130 - we'll mute using some unconnected audio input
198 * 7134 - we'll probably should switch external mux with gpio 198 * 7134 - we'll probably should switch external mux with gpio
@@ -204,13 +204,14 @@ static void mute_input_7134(struct saa7134_dev *dev)
204 if (dev->hw_mute == mute && 204 if (dev->hw_mute == mute &&
205 dev->hw_input == in && !dev->insuspend) { 205 dev->hw_input == in && !dev->insuspend) {
206 audio_dbg(1, "mute/input: nothing to do [mute=%d,input=%s]\n", 206 audio_dbg(1, "mute/input: nothing to do [mute=%d,input=%s]\n",
207 mute, in->name); 207 mute, saa7134_input_name[in->type]);
208 return; 208 return;
209 } 209 }
210 210
211 audio_dbg(1, "ctl_mute=%d automute=%d input=%s => mute=%d input=%s\n", 211 audio_dbg(1, "ctl_mute=%d automute=%d input=%s => mute=%d input=%s\n",
212 dev->ctl_mute, dev->automute, 212 dev->ctl_mute, dev->automute,
213 dev->input->name, mute, in->name); 213 saa7134_input_name[dev->input->type], mute,
214 saa7134_input_name[in->type]);
214 dev->hw_mute = mute; 215 dev->hw_mute = mute;
215 dev->hw_input = in; 216 dev->hw_input = in;
216 217
@@ -245,7 +246,7 @@ static void mute_input_7134(struct saa7134_dev *dev)
245 mask = card(dev).gpiomask; 246 mask = card(dev).gpiomask;
246 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask); 247 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask);
247 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio); 248 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
248 saa7134_track_gpio(dev,in->name); 249 saa7134_track_gpio(dev, saa7134_input_name[in->type]);
249} 250}
250 251
251static void tvaudio_setmode(struct saa7134_dev *dev, 252static void tvaudio_setmode(struct saa7134_dev *dev,
@@ -756,14 +757,14 @@ static int mute_input_7133(struct saa7134_dev *dev)
756 if (0 != card(dev).gpiomask) { 757 if (0 != card(dev).gpiomask) {
757 mask = card(dev).gpiomask; 758 mask = card(dev).gpiomask;
758 759
759 if (card(dev).mute.name && dev->ctl_mute) 760 if (card(dev).mute.type && dev->ctl_mute)
760 in = &card(dev).mute; 761 in = &card(dev).mute;
761 else 762 else
762 in = dev->input; 763 in = dev->input;
763 764
764 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask); 765 saa_andorl(SAA7134_GPIO_GPMODE0 >> 2, mask, mask);
765 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio); 766 saa_andorl(SAA7134_GPIO_GPSTATUS0 >> 2, mask, in->gpio);
766 saa7134_track_gpio(dev,in->name); 767 saa7134_track_gpio(dev, saa7134_input_name[in->type]);
767 } 768 }
768 769
769 return 0; 770 return 0;
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 7a42d3ae3ac9..ae52ef019e43 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -409,7 +409,8 @@ static void set_tvnorm(struct saa7134_dev *dev, struct saa7134_tvnorm *norm)
409 409
410static void video_mux(struct saa7134_dev *dev, int input) 410static void video_mux(struct saa7134_dev *dev, int input)
411{ 411{
412 video_dbg("video input = %d [%s]\n", input, card_in(dev, input).name); 412 video_dbg("video input = %d [%s]\n",
413 input, saa7134_input_name[card_in(dev, input).type]);
413 dev->ctl_input = input; 414 dev->ctl_input = input;
414 set_tvnorm(dev, dev->tvnorm); 415 set_tvnorm(dev, dev->tvnorm);
415 saa7134_tvaudio_setinput(dev, &card_in(dev, input)); 416 saa7134_tvaudio_setinput(dev, &card_in(dev, input));
@@ -1381,11 +1382,11 @@ int saa7134_enum_input(struct file *file, void *priv, struct v4l2_input *i)
1381 n = i->index; 1382 n = i->index;
1382 if (n >= SAA7134_INPUT_MAX) 1383 if (n >= SAA7134_INPUT_MAX)
1383 return -EINVAL; 1384 return -EINVAL;
1384 if (NULL == card_in(dev, i->index).name) 1385 if (card_in(dev, i->index).type == SAA7134_NO_INPUT)
1385 return -EINVAL; 1386 return -EINVAL;
1386 i->index = n; 1387 i->index = n;
1387 i->type = V4L2_INPUT_TYPE_CAMERA; 1388 i->type = V4L2_INPUT_TYPE_CAMERA;
1388 strcpy(i->name, card_in(dev, n).name); 1389 strcpy(i->name, saa7134_input_name[card_in(dev, n).type]);
1389 if (card_in(dev, n).tv) 1390 if (card_in(dev, n).tv)
1390 i->type = V4L2_INPUT_TYPE_TUNER; 1391 i->type = V4L2_INPUT_TYPE_TUNER;
1391 if (n == dev->ctl_input) { 1392 if (n == dev->ctl_input) {
@@ -1419,7 +1420,7 @@ int saa7134_s_input(struct file *file, void *priv, unsigned int i)
1419 1420
1420 if (i >= SAA7134_INPUT_MAX) 1421 if (i >= SAA7134_INPUT_MAX)
1421 return -EINVAL; 1422 return -EINVAL;
1422 if (NULL == card_in(dev, i).name) 1423 if (card_in(dev, i).type == SAA7134_NO_INPUT)
1423 return -EINVAL; 1424 return -EINVAL;
1424 video_mux(dev, i); 1425 video_mux(dev, i);
1425 return 0; 1426 return 0;
@@ -1661,7 +1662,7 @@ int saa7134_g_tuner(struct file *file, void *priv,
1661 } 1662 }
1662 if (n == SAA7134_INPUT_MAX) 1663 if (n == SAA7134_INPUT_MAX)
1663 return -EINVAL; 1664 return -EINVAL;
1664 if (NULL != card_in(dev, n).name) { 1665 if (card_in(dev, n).type != SAA7134_NO_INPUT) {
1665 strcpy(t->name, "Television"); 1666 strcpy(t->name, "Television");
1666 t->type = V4L2_TUNER_ANALOG_TV; 1667 t->type = V4L2_TUNER_ANALOG_TV;
1667 saa_call_all(dev, tuner, g_tuner, t); 1668 saa_call_all(dev, tuner, g_tuner, t);
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 5938bc781999..274a472e7d6b 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -361,12 +361,30 @@ struct saa7134_card_ir {
361#define SET_CLOCK_INVERTED (1 << 2) 361#define SET_CLOCK_INVERTED (1 << 2)
362#define SET_VSYNC_OFF (1 << 3) 362#define SET_VSYNC_OFF (1 << 3)
363 363
364enum saa7134_input_types {
365 SAA7134_NO_INPUT = 0,
366 SAA7134_INPUT_MUTE,
367 SAA7134_INPUT_RADIO,
368 SAA7134_INPUT_TV,
369 SAA7134_INPUT_TV_MONO,
370 SAA7134_INPUT_COMPOSITE,
371 SAA7134_INPUT_COMPOSITE0,
372 SAA7134_INPUT_COMPOSITE1,
373 SAA7134_INPUT_COMPOSITE2,
374 SAA7134_INPUT_COMPOSITE3,
375 SAA7134_INPUT_COMPOSITE4,
376 SAA7134_INPUT_SVIDEO,
377 SAA7134_INPUT_SVIDEO0,
378 SAA7134_INPUT_SVIDEO1,
379 SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
380};
381
364struct saa7134_input { 382struct saa7134_input {
365 char *name; 383 enum saa7134_input_types type;
366 unsigned int vmux; 384 unsigned int vmux;
367 enum saa7134_audio_in amux; 385 enum saa7134_audio_in amux;
368 unsigned int gpio; 386 unsigned int gpio;
369 unsigned int tv:1; 387 unsigned int tv:1;
370}; 388};
371 389
372enum saa7134_mpeg_type { 390enum saa7134_mpeg_type {
@@ -410,7 +428,7 @@ struct saa7134_board {
410 unsigned int ts_force_val:1; 428 unsigned int ts_force_val:1;
411}; 429};
412 430
413#define card_has_radio(dev) (NULL != saa7134_boards[dev->board].radio.name) 431#define card_has_radio(dev) (SAA7134_NO_INPUT != saa7134_boards[dev->board].radio.type)
414#define card_is_empress(dev) (SAA7134_MPEG_EMPRESS == saa7134_boards[dev->board].mpeg) 432#define card_is_empress(dev) (SAA7134_MPEG_EMPRESS == saa7134_boards[dev->board].mpeg)
415#define card_is_dvb(dev) (SAA7134_MPEG_DVB == saa7134_boards[dev->board].mpeg) 433#define card_is_dvb(dev) (SAA7134_MPEG_DVB == saa7134_boards[dev->board].mpeg)
416#define card_is_go7007(dev) (SAA7134_MPEG_GO7007 == saa7134_boards[dev->board].mpeg) 434#define card_is_go7007(dev) (SAA7134_MPEG_GO7007 == saa7134_boards[dev->board].mpeg)
@@ -727,7 +745,7 @@ extern struct mutex saa7134_devlist_lock;
727extern int saa7134_no_overlay; 745extern int saa7134_no_overlay;
728extern bool saa7134_userptr; 746extern bool saa7134_userptr;
729 747
730void saa7134_track_gpio(struct saa7134_dev *dev, char *msg); 748void saa7134_track_gpio(struct saa7134_dev *dev, const char *msg);
731void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value); 749void saa7134_set_gpio(struct saa7134_dev *dev, int bit_no, int value);
732 750
733#define SAA7134_PGTABLE_SIZE 4096 751#define SAA7134_PGTABLE_SIZE 4096
@@ -760,6 +778,7 @@ extern int (*saa7134_dmasound_exit)(struct saa7134_dev *dev);
760/* saa7134-cards.c */ 778/* saa7134-cards.c */
761 779
762extern struct saa7134_board saa7134_boards[]; 780extern struct saa7134_board saa7134_boards[];
781extern const char * const saa7134_input_name[];
763extern const unsigned int saa7134_bcount; 782extern const unsigned int saa7134_bcount;
764extern struct pci_device_id saa7134_pci_tbl[]; 783extern struct pci_device_id saa7134_pci_tbl[];
765 784
generated by cgit v1.2.2 (git 2.25.0) at 2025-04-24 20:46:11 -0400