summaryrefslogtreecommitdiffstats
path: root/drivers/media/pci
diff options
context:
space:
mode:
authorMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-05 07:37:18 -0500
committerMauro Carvalho Chehab <mchehab@osg.samsung.com>2016-02-10 04:23:43 -0500
commit8bf77f9e7013e46ca08151189357532f027c47e8 (patch)
tree6eb195592bf0bb575532097e05689de2804ab114 /drivers/media/pci
parent568b2febeeb139879efe93756aa58e2e42559f90 (diff)
[media] saa7134: Get rid of struct saa7134_input.tv field
The saa7134_input.tv field was used to indicate if an input had a RF signal for TV input. This is not needed anymore, as the input type can be checked directly by the driver. Also, due to a past bug when setting the TV standard at the demod, all inputs should have this field set, with is wrong. This reduces the size of the saa7134_boards by about 8KB, on i386 (and probably twice on 64 bits), with is a nice colateral effect: text data bss dec hex filename 241047 136831 66356 444234 6c74a drivers/media/pci/saa7134/saa7134.o.old 240851 128895 66292 436038 6a746 drivers/media/pci/saa7134/saa7134.o Signed-off-by: Mauro Carvalho Chehab <mchehab@osg.samsung.com>
Diffstat (limited to 'drivers/media/pci')
-rw-r--r--drivers/media/pci/saa7134/saa7134-cards.c194
-rw-r--r--drivers/media/pci/saa7134/saa7134-video.c13
-rw-r--r--drivers/media/pci/saa7134/saa7134.h1
3 files changed, 10 insertions, 198 deletions
diff --git a/drivers/media/pci/saa7134/saa7134-cards.c b/drivers/media/pci/saa7134/saa7134-cards.c
index 19975cec5da7..9a2fdc78eb85 100644
--- a/drivers/media/pci/saa7134/saa7134-cards.c
+++ b/drivers/media/pci/saa7134/saa7134-cards.c
@@ -97,12 +97,10 @@ struct saa7134_board saa7134_boards[] = {
97 .type = SAA7134_INPUT_TV, 97 .type = SAA7134_INPUT_TV,
98 .vmux = 1, 98 .vmux = 1,
99 .amux = TV, 99 .amux = TV,
100 .tv = 1,
101 },{ 100 },{
102 .type = SAA7134_INPUT_TV_MONO, 101 .type = SAA7134_INPUT_TV_MONO,
103 .vmux = 1, 102 .vmux = 1,
104 .amux = LINE2, 103 .amux = LINE2,
105 .tv = 1,
106 }}, 104 }},
107 .radio = { 105 .radio = {
108 .type = SAA7134_INPUT_RADIO, 106 .type = SAA7134_INPUT_RADIO,
@@ -124,13 +122,11 @@ struct saa7134_board saa7134_boards[] = {
124 .vmux = 1, 122 .vmux = 1,
125 .amux = TV, 123 .amux = TV,
126 .gpio = 0x8000, 124 .gpio = 0x8000,
127 .tv = 1,
128 },{ 125 },{
129 .type = SAA7134_INPUT_TV_MONO, 126 .type = SAA7134_INPUT_TV_MONO,
130 .vmux = 1, 127 .vmux = 1,
131 .amux = LINE2, 128 .amux = LINE2,
132 .gpio = 0x0000, 129 .gpio = 0x0000,
133 .tv = 1,
134 },{ 130 },{
135 .type = SAA7134_INPUT_COMPOSITE1, 131 .type = SAA7134_INPUT_COMPOSITE1,
136 .vmux = 0, 132 .vmux = 0,
@@ -173,7 +169,6 @@ struct saa7134_board saa7134_boards[] = {
173 .vmux = 1, 169 .vmux = 1,
174 .amux = LINE2, 170 .amux = LINE2,
175 .gpio = 0x0000, 171 .gpio = 0x0000,
176 .tv = 1,
177 },{ 172 },{
178 .type = SAA7134_INPUT_COMPOSITE1, 173 .type = SAA7134_INPUT_COMPOSITE1,
179 .vmux = 0, 174 .vmux = 0,
@@ -214,7 +209,6 @@ struct saa7134_board saa7134_boards[] = {
214 .type = SAA7134_INPUT_TV, 209 .type = SAA7134_INPUT_TV,
215 .vmux = 1, 210 .vmux = 1,
216 .amux = TV, 211 .amux = TV,
217 .tv = 1,
218 },{ 212 },{
219 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO, 213 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
220 .vmux = 0, 214 .vmux = 0,
@@ -245,13 +239,11 @@ struct saa7134_board saa7134_boards[] = {
245 .vmux = 1, 239 .vmux = 1,
246 .amux = TV, 240 .amux = TV,
247 .gpio = 0x10000, /* GP16=1 selects TV input */ 241 .gpio = 0x10000, /* GP16=1 selects TV input */
248 .tv = 1,
249 },{ 242 },{
250/* .type = SAA7134_INPUT_TV_MONO, 243/* .type = SAA7134_INPUT_TV_MONO,
251 .vmux = 1, 244 .vmux = 1,
252 .amux = LINE2, 245 .amux = LINE2,
253 .gpio = 0x0000, 246 .gpio = 0x0000,
254 .tv = 1,
255 },{ 247 },{
256*/ .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO, 248*/ .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
257 .vmux = 0, 249 .vmux = 0,
@@ -295,13 +287,11 @@ struct saa7134_board saa7134_boards[] = {
295 .vmux = 1, 287 .vmux = 1,
296 .amux = TV, 288 .amux = TV,
297 .gpio = 0x8000, 289 .gpio = 0x8000,
298 .tv = 1,
299 }, { 290 }, {
300 .type = SAA7134_INPUT_TV_MONO, 291 .type = SAA7134_INPUT_TV_MONO,
301 .vmux = 1, 292 .vmux = 1,
302 .amux = LINE2, 293 .amux = LINE2,
303 .gpio = 0x0000, 294 .gpio = 0x0000,
304 .tv = 1,
305 }, { 295 }, {
306 .type = SAA7134_INPUT_COMPOSITE1, 296 .type = SAA7134_INPUT_COMPOSITE1,
307 .vmux = 0, 297 .vmux = 0,
@@ -351,7 +341,6 @@ struct saa7134_board saa7134_boards[] = {
351 .type = SAA7134_INPUT_TV, 341 .type = SAA7134_INPUT_TV,
352 .vmux = 1, 342 .vmux = 1,
353 .amux = LINE2, 343 .amux = LINE2,
354 .tv = 1,
355 }}, 344 }},
356 .radio = { 345 .radio = {
357 .type = SAA7134_INPUT_RADIO, 346 .type = SAA7134_INPUT_RADIO,
@@ -373,7 +362,6 @@ struct saa7134_board saa7134_boards[] = {
373 .type = SAA7134_INPUT_TV, 362 .type = SAA7134_INPUT_TV,
374 .vmux = 1, 363 .vmux = 1,
375 .amux = TV, 364 .amux = TV,
376 .tv = 1,
377 },{ 365 },{
378 .type = SAA7134_INPUT_COMPOSITE1, 366 .type = SAA7134_INPUT_COMPOSITE1,
379 .vmux = 0, 367 .vmux = 0,
@@ -399,13 +387,11 @@ struct saa7134_board saa7134_boards[] = {
399 .type = SAA7134_INPUT_TV, 387 .type = SAA7134_INPUT_TV,
400 .vmux = 1, 388 .vmux = 1,
401 .amux = TV, 389 .amux = TV,
402 .tv = 1,
403 },{ 390 },{
404 /* workaround for problems with normal TV sound */ 391 /* workaround for problems with normal TV sound */
405 .type = SAA7134_INPUT_TV_MONO, 392 .type = SAA7134_INPUT_TV_MONO,
406 .vmux = 1, 393 .vmux = 1,
407 .amux = LINE2, 394 .amux = LINE2,
408 .tv = 1,
409 },{ 395 },{
410 .type = SAA7134_INPUT_COMPOSITE1, 396 .type = SAA7134_INPUT_COMPOSITE1,
411 .vmux = 0, 397 .vmux = 0,
@@ -441,12 +427,10 @@ struct saa7134_board saa7134_boards[] = {
441 .type = SAA7134_INPUT_TV, 427 .type = SAA7134_INPUT_TV,
442 .vmux = 1, 428 .vmux = 1,
443 .amux = TV, 429 .amux = TV,
444 .tv = 1,
445 },{ 430 },{
446 .type = SAA7134_INPUT_TV_MONO, 431 .type = SAA7134_INPUT_TV_MONO,
447 .vmux = 1, 432 .vmux = 1,
448 .amux = LINE2, 433 .amux = LINE2,
449 .tv = 1,
450 },{ 434 },{
451 435
452 .type = SAA7134_INPUT_SVIDEO, 436 .type = SAA7134_INPUT_SVIDEO,
@@ -481,7 +465,6 @@ struct saa7134_board saa7134_boards[] = {
481 .type = SAA7134_INPUT_TV, 465 .type = SAA7134_INPUT_TV,
482 .vmux = 1, 466 .vmux = 1,
483 .amux = TV, 467 .amux = TV,
484 .tv = 1,
485 .gpio = 0x20000, 468 .gpio = 0x20000,
486 },{ 469 },{
487 .type = SAA7134_INPUT_SVIDEO, 470 .type = SAA7134_INPUT_SVIDEO,
@@ -513,7 +496,6 @@ struct saa7134_board saa7134_boards[] = {
513 .type = SAA7134_INPUT_TV, 496 .type = SAA7134_INPUT_TV,
514 .vmux = 1, 497 .vmux = 1,
515 .amux = TV, 498 .amux = TV,
516 .tv = 1,
517 },{ 499 },{
518 .type = SAA7134_INPUT_COMPOSITE, 500 .type = SAA7134_INPUT_COMPOSITE,
519 .vmux = 4, 501 .vmux = 4,
@@ -540,13 +522,11 @@ struct saa7134_board saa7134_boards[] = {
540 .type = SAA7134_INPUT_TV, 522 .type = SAA7134_INPUT_TV,
541 .vmux = 1, 523 .vmux = 1,
542 .amux = TV, 524 .amux = TV,
543 .tv = 1,
544 },{ 525 },{
545 /* workaround for problems with normal TV sound */ 526 /* workaround for problems with normal TV sound */
546 .type = SAA7134_INPUT_TV_MONO, 527 .type = SAA7134_INPUT_TV_MONO,
547 .vmux = 1, 528 .vmux = 1,
548 .amux = LINE2, 529 .amux = LINE2,
549 .tv = 1,
550 },{ 530 },{
551 .type = SAA7134_INPUT_COMPOSITE1, 531 .type = SAA7134_INPUT_COMPOSITE1,
552 .vmux = 0, 532 .vmux = 0,
@@ -584,7 +564,6 @@ struct saa7134_board saa7134_boards[] = {
584 .type = SAA7134_INPUT_TV, 564 .type = SAA7134_INPUT_TV,
585 .vmux = 1, 565 .vmux = 1,
586 .amux = LINE2, 566 .amux = LINE2,
587 .tv = 1,
588 }}, 567 }},
589 }, 568 },
590 [SAA7134_BOARD_CINERGY600] = { 569 [SAA7134_BOARD_CINERGY600] = {
@@ -599,7 +578,6 @@ struct saa7134_board saa7134_boards[] = {
599 .type = SAA7134_INPUT_TV, 578 .type = SAA7134_INPUT_TV,
600 .vmux = 1, 579 .vmux = 1,
601 .amux = TV, 580 .amux = TV,
602 .tv = 1,
603 },{ 581 },{
604 .type = SAA7134_INPUT_COMPOSITE1, 582 .type = SAA7134_INPUT_COMPOSITE1,
605 .vmux = 4, 583 .vmux = 4,
@@ -631,7 +609,6 @@ struct saa7134_board saa7134_boards[] = {
631 .type = SAA7134_INPUT_TV, 609 .type = SAA7134_INPUT_TV,
632 .vmux = 1, 610 .vmux = 1,
633 .amux = TV, 611 .amux = TV,
634 .tv = 1,
635 },{ 612 },{
636 .type = SAA7134_INPUT_COMPOSITE1, 613 .type = SAA7134_INPUT_COMPOSITE1,
637 .vmux = 0, 614 .vmux = 0,
@@ -664,7 +641,6 @@ struct saa7134_board saa7134_boards[] = {
664 .type = SAA7134_INPUT_TV, 641 .type = SAA7134_INPUT_TV,
665 .vmux = 1, 642 .vmux = 1,
666 .amux = TV, 643 .amux = TV,
667 .tv = 1,
668 },{ 644 },{
669 .type = SAA7134_INPUT_COMPOSITE1, 645 .type = SAA7134_INPUT_COMPOSITE1,
670 .vmux = 3, 646 .vmux = 3,
@@ -698,7 +674,6 @@ struct saa7134_board saa7134_boards[] = {
698 .type = SAA7134_INPUT_TV, 674 .type = SAA7134_INPUT_TV,
699 .vmux = 4, 675 .vmux = 4,
700 .amux = LINE2, 676 .amux = LINE2,
701 .tv = 1,
702 }}, 677 }},
703 }, 678 },
704 [SAA7134_BOARD_ELSA_500TV] = { 679 [SAA7134_BOARD_ELSA_500TV] = {
@@ -716,12 +691,10 @@ struct saa7134_board saa7134_boards[] = {
716 .type = SAA7134_INPUT_TV, 691 .type = SAA7134_INPUT_TV,
717 .vmux = 8, 692 .vmux = 8,
718 .amux = TV, 693 .amux = TV,
719 .tv = 1,
720 },{ 694 },{
721 .type = SAA7134_INPUT_TV_MONO, 695 .type = SAA7134_INPUT_TV_MONO,
722 .vmux = 8, 696 .vmux = 8,
723 .amux = LINE2, 697 .amux = LINE2,
724 .tv = 1,
725 }}, 698 }},
726 }, 699 },
727 [SAA7134_BOARD_ELSA_700TV] = { 700 [SAA7134_BOARD_ELSA_700TV] = {
@@ -735,7 +708,6 @@ struct saa7134_board saa7134_boards[] = {
735 .type = SAA7134_INPUT_TV, 708 .type = SAA7134_INPUT_TV,
736 .vmux = 4, 709 .vmux = 4,
737 .amux = LINE2, 710 .amux = LINE2,
738 .tv = 1,
739 },{ 711 },{
740 .type = SAA7134_INPUT_COMPOSITE1, 712 .type = SAA7134_INPUT_COMPOSITE1,
741 .vmux = 6, 713 .vmux = 6,
@@ -762,7 +734,6 @@ struct saa7134_board saa7134_boards[] = {
762 .type = SAA7134_INPUT_TV, 734 .type = SAA7134_INPUT_TV,
763 .vmux = 1, 735 .vmux = 1,
764 .amux = TV, 736 .amux = TV,
765 .tv = 1,
766 },{ 737 },{
767 .type = SAA7134_INPUT_COMPOSITE1, 738 .type = SAA7134_INPUT_COMPOSITE1,
768 .vmux = 4, 739 .vmux = 4,
@@ -790,7 +761,6 @@ struct saa7134_board saa7134_boards[] = {
790 .vmux = 1, 761 .vmux = 1,
791 .amux = TV, 762 .amux = TV,
792 .gpio = 0x0000, 763 .gpio = 0x0000,
793 .tv = 1,
794 },{ 764 },{
795 .type = SAA7134_INPUT_COMPOSITE1, 765 .type = SAA7134_INPUT_COMPOSITE1,
796 .vmux = 4, 766 .vmux = 4,
@@ -832,7 +802,6 @@ struct saa7134_board saa7134_boards[] = {
832 .type = SAA7134_INPUT_TV, 802 .type = SAA7134_INPUT_TV,
833 .vmux = 1, 803 .vmux = 1,
834 .amux = LINE2, 804 .amux = LINE2,
835 .tv = 1,
836 }}, 805 }},
837 }, 806 },
838 [SAA7134_BOARD_10MOONSTVMASTER] = { 807 [SAA7134_BOARD_10MOONSTVMASTER] = {
@@ -849,7 +818,6 @@ struct saa7134_board saa7134_boards[] = {
849 .vmux = 1, 818 .vmux = 1,
850 .amux = LINE2, 819 .amux = LINE2,
851 .gpio = 0x0000, 820 .gpio = 0x0000,
852 .tv = 1,
853 },{ 821 },{
854 .type = SAA7134_INPUT_COMPOSITE1, 822 .type = SAA7134_INPUT_COMPOSITE1,
855 .vmux = 0, 823 .vmux = 0,
@@ -929,7 +897,6 @@ struct saa7134_board saa7134_boards[] = {
929 .type = SAA7134_INPUT_TV, 897 .type = SAA7134_INPUT_TV,
930 .vmux = 1, 898 .vmux = 1,
931 .amux = LINE2, 899 .amux = LINE2,
932 .tv = 1,
933 }}, 900 }},
934 }, 901 },
935 [SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUS] = { 902 [SAA7134_BOARD_VIDEOMATE_TV_GOLD_PLUS] = {
@@ -955,7 +922,6 @@ struct saa7134_board saa7134_boards[] = {
955 .vmux = 1, 922 .vmux = 1,
956 .amux = LINE2, 923 .amux = LINE2,
957 .gpio = 0x08c20012, 924 .gpio = 0x08c20012,
958 .tv = 1,
959 }}, /* radio and probably mute is missing */ 925 }}, /* radio and probably mute is missing */
960 }, 926 },
961 [SAA7134_BOARD_CRONOS_PLUS] = { 927 [SAA7134_BOARD_CRONOS_PLUS] = {
@@ -1008,7 +974,6 @@ struct saa7134_board saa7134_boards[] = {
1008 .type = SAA7134_INPUT_TV, 974 .type = SAA7134_INPUT_TV,
1009 .vmux = 1, 975 .vmux = 1,
1010 .amux = TV, 976 .amux = TV,
1011 .tv = 1,
1012 .gpio = 0x00, 977 .gpio = 0x00,
1013 }, { 978 }, {
1014 .type = SAA7134_INPUT_COMPOSITE1, 979 .type = SAA7134_INPUT_COMPOSITE1,
@@ -1058,7 +1023,6 @@ struct saa7134_board saa7134_boards[] = {
1058 .type = SAA7134_INPUT_TV, 1023 .type = SAA7134_INPUT_TV,
1059 .vmux = 3, 1024 .vmux = 3,
1060 .amux = TV, 1025 .amux = TV,
1061 .tv = 1,
1062 }}, 1026 }},
1063 .mpeg = SAA7134_MPEG_EMPRESS, 1027 .mpeg = SAA7134_MPEG_EMPRESS,
1064 .video_out = CCIR656, 1028 .video_out = CCIR656,
@@ -1077,7 +1041,6 @@ struct saa7134_board saa7134_boards[] = {
1077 .type = SAA7134_INPUT_TV, 1041 .type = SAA7134_INPUT_TV,
1078 .vmux = 1, 1042 .vmux = 1,
1079 .amux = TV, 1043 .amux = TV,
1080 .tv = 1,
1081 1044
1082 },{ 1045 },{
1083 .type = SAA7134_INPUT_COMPOSITE1, 1046 .type = SAA7134_INPUT_COMPOSITE1,
@@ -1105,7 +1068,6 @@ struct saa7134_board saa7134_boards[] = {
1105 .type = SAA7134_INPUT_TV, 1068 .type = SAA7134_INPUT_TV,
1106 .vmux = 3, 1069 .vmux = 3,
1107 .amux = TV, 1070 .amux = TV,
1108 .tv = 1,
1109 },{ 1071 },{
1110 .type = SAA7134_INPUT_COMPOSITE1, 1072 .type = SAA7134_INPUT_COMPOSITE1,
1111 .vmux = 0, 1073 .vmux = 0,
@@ -1140,7 +1102,6 @@ struct saa7134_board saa7134_boards[] = {
1140 .type = SAA7134_INPUT_TV, 1102 .type = SAA7134_INPUT_TV,
1141 .vmux = 3, 1103 .vmux = 3,
1142 .amux = LINE2, 1104 .amux = LINE2,
1143 .tv = 1,
1144 }}, 1105 }},
1145 .radio = { 1106 .radio = {
1146 .type = SAA7134_INPUT_RADIO, 1107 .type = SAA7134_INPUT_RADIO,
@@ -1167,7 +1128,6 @@ struct saa7134_board saa7134_boards[] = {
1167 .type = SAA7134_INPUT_TV, 1128 .type = SAA7134_INPUT_TV,
1168 .vmux = 3, 1129 .vmux = 3,
1169 .amux = LINE2, 1130 .amux = LINE2,
1170 .tv = 1,
1171 }}, 1131 }},
1172 .mute = { 1132 .mute = {
1173 .type = SAA7134_INPUT_MUTE, 1133 .type = SAA7134_INPUT_MUTE,
@@ -1186,7 +1146,6 @@ struct saa7134_board saa7134_boards[] = {
1186 .type = SAA7134_INPUT_TV, 1146 .type = SAA7134_INPUT_TV,
1187 .vmux = 1, 1147 .vmux = 1,
1188 .amux = LINE2, 1148 .amux = LINE2,
1189 .tv = 1,
1190 },{ 1149 },{
1191 .type = SAA7134_INPUT_COMPOSITE1, 1150 .type = SAA7134_INPUT_COMPOSITE1,
1192 .vmux = 3, 1151 .vmux = 3,
@@ -1208,12 +1167,10 @@ struct saa7134_board saa7134_boards[] = {
1208 .type = SAA7134_INPUT_TV, 1167 .type = SAA7134_INPUT_TV,
1209 .vmux = 1, 1168 .vmux = 1,
1210 .amux = TV, 1169 .amux = TV,
1211 .tv = 1,
1212 },{ 1170 },{
1213 .type = SAA7134_INPUT_TV_MONO, 1171 .type = SAA7134_INPUT_TV_MONO,
1214 .vmux = 1, 1172 .vmux = 1,
1215 .amux = LINE2, 1173 .amux = LINE2,
1216 .tv = 1,
1217 },{ 1174 },{
1218 .type = SAA7134_INPUT_COMPOSITE1, 1175 .type = SAA7134_INPUT_COMPOSITE1,
1219 .vmux = 3, 1176 .vmux = 3,
@@ -1243,12 +1200,10 @@ struct saa7134_board saa7134_boards[] = {
1243 .type = SAA7134_INPUT_TV, 1200 .type = SAA7134_INPUT_TV,
1244 .vmux = 1, 1201 .vmux = 1,
1245 .amux = TV, 1202 .amux = TV,
1246 .tv = 1,
1247 },{ 1203 },{
1248 .type = SAA7134_INPUT_TV_MONO, 1204 .type = SAA7134_INPUT_TV_MONO,
1249 .vmux = 1, 1205 .vmux = 1,
1250 .amux = LINE2, 1206 .amux = LINE2,
1251 .tv = 1,
1252 },{ 1207 },{
1253 .type = SAA7134_INPUT_COMPOSITE1, 1208 .type = SAA7134_INPUT_COMPOSITE1,
1254 .vmux = 3, 1209 .vmux = 3,
@@ -1279,12 +1234,10 @@ struct saa7134_board saa7134_boards[] = {
1279 .type = SAA7134_INPUT_TV, 1234 .type = SAA7134_INPUT_TV,
1280 .vmux = 1, 1235 .vmux = 1,
1281 .amux = TV, 1236 .amux = TV,
1282 .tv = 1,
1283 },{ 1237 },{
1284 .type = SAA7134_INPUT_TV_MONO, 1238 .type = SAA7134_INPUT_TV_MONO,
1285 .vmux = 1, 1239 .vmux = 1,
1286 .amux = LINE2, 1240 .amux = LINE2,
1287 .tv = 1,
1288 },{ 1241 },{
1289 .type = SAA7134_INPUT_COMPOSITE1, 1242 .type = SAA7134_INPUT_COMPOSITE1,
1290 .vmux = 3, 1243 .vmux = 3,
@@ -1315,12 +1268,10 @@ struct saa7134_board saa7134_boards[] = {
1315 .type = SAA7134_INPUT_TV, 1268 .type = SAA7134_INPUT_TV,
1316 .vmux = 1, 1269 .vmux = 1,
1317 .amux = TV, 1270 .amux = TV,
1318 .tv = 1,
1319 },{ 1271 },{
1320 .type = SAA7134_INPUT_TV_MONO, 1272 .type = SAA7134_INPUT_TV_MONO,
1321 .vmux = 1, 1273 .vmux = 1,
1322 .amux = LINE2, 1274 .amux = LINE2,
1323 .tv = 1,
1324 },{ 1275 },{
1325 .type = SAA7134_INPUT_COMPOSITE1, 1276 .type = SAA7134_INPUT_COMPOSITE1,
1326 .vmux = 0, 1277 .vmux = 0,
@@ -1369,7 +1320,6 @@ struct saa7134_board saa7134_boards[] = {
1369 .type = SAA7134_INPUT_TV, 1320 .type = SAA7134_INPUT_TV,
1370 .vmux = 1, 1321 .vmux = 1,
1371 .amux = TV, 1322 .amux = TV,
1372 .tv = 1,
1373 } }, 1323 } },
1374 }, 1324 },
1375 [SAA7134_BOARD_NOVAC_PRIMETV7133] = { 1325 [SAA7134_BOARD_NOVAC_PRIMETV7133] = {
@@ -1387,7 +1337,6 @@ struct saa7134_board saa7134_boards[] = {
1387 .type = SAA7134_INPUT_TV, 1337 .type = SAA7134_INPUT_TV,
1388 .vmux = 1, 1338 .vmux = 1,
1389 .amux = TV, 1339 .amux = TV,
1390 .tv = 1,
1391 },{ 1340 },{
1392 .type = SAA7134_INPUT_SVIDEO, 1341 .type = SAA7134_INPUT_SVIDEO,
1393 .vmux = 8, 1342 .vmux = 8,
@@ -1405,7 +1354,6 @@ struct saa7134_board saa7134_boards[] = {
1405 .type = SAA7134_INPUT_TV, 1354 .type = SAA7134_INPUT_TV,
1406 .vmux = 1, 1355 .vmux = 1,
1407 .amux = LINE2, 1356 .amux = LINE2,
1408 .tv = 1,
1409 },{ 1357 },{
1410 .type = SAA7134_INPUT_COMPOSITE1, 1358 .type = SAA7134_INPUT_COMPOSITE1,
1411 .vmux = 0, 1359 .vmux = 0,
@@ -1441,7 +1389,6 @@ struct saa7134_board saa7134_boards[] = {
1441 .type = SAA7134_INPUT_TV, 1389 .type = SAA7134_INPUT_TV,
1442 .vmux = 1, 1390 .vmux = 1,
1443 .amux = LINE2, 1391 .amux = LINE2,
1444 .tv = 1,
1445 }, { 1392 }, {
1446 .type = SAA7134_INPUT_COMPOSITE1, 1393 .type = SAA7134_INPUT_COMPOSITE1,
1447 .vmux = 0, 1394 .vmux = 0,
@@ -1476,7 +1423,6 @@ struct saa7134_board saa7134_boards[] = {
1476 .type = SAA7134_INPUT_TV, 1423 .type = SAA7134_INPUT_TV,
1477 .vmux = 7, 1424 .vmux = 7,
1478 .amux = TV, 1425 .amux = TV,
1479 .tv = 1,
1480 },{ 1426 },{
1481 .type = SAA7134_INPUT_SVIDEO, 1427 .type = SAA7134_INPUT_SVIDEO,
1482 .vmux = 7, 1428 .vmux = 7,
@@ -1495,7 +1441,6 @@ struct saa7134_board saa7134_boards[] = {
1495 .type = SAA7134_INPUT_TV, 1441 .type = SAA7134_INPUT_TV,
1496 .vmux = 3, 1442 .vmux = 3,
1497 .amux = TV, 1443 .amux = TV,
1498 .tv = 1,
1499 },{ 1444 },{
1500 .type = SAA7134_INPUT_COMPOSITE1, 1445 .type = SAA7134_INPUT_COMPOSITE1,
1501 .vmux = 1, 1446 .vmux = 1,
@@ -1521,7 +1466,6 @@ struct saa7134_board saa7134_boards[] = {
1521 .type = SAA7134_INPUT_TV, 1466 .type = SAA7134_INPUT_TV,
1522 .vmux = 1, 1467 .vmux = 1,
1523 .amux = LINE2, 1468 .amux = LINE2,
1524 .tv = 1,
1525 },{ 1469 },{
1526 .type = SAA7134_INPUT_COMPOSITE1, 1470 .type = SAA7134_INPUT_COMPOSITE1,
1527 .vmux = 4, 1471 .vmux = 4,
@@ -1563,7 +1507,6 @@ struct saa7134_board saa7134_boards[] = {
1563 .type = SAA7134_INPUT_TV, 1507 .type = SAA7134_INPUT_TV,
1564 .vmux = 1, 1508 .vmux = 1,
1565 .amux = LINE2_LEFT, 1509 .amux = LINE2_LEFT,
1566 .tv = 1,
1567 .gpio = 0x00080, 1510 .gpio = 0x00080,
1568 }}, 1511 }},
1569 .radio = { 1512 .radio = {
@@ -1593,7 +1536,6 @@ struct saa7134_board saa7134_boards[] = {
1593 .type = SAA7134_INPUT_TV, 1536 .type = SAA7134_INPUT_TV,
1594 .vmux = 3, 1537 .vmux = 3,
1595 .amux = LINE2, 1538 .amux = LINE2,
1596 .tv = 1,
1597 },{ 1539 },{
1598 .type = SAA7134_INPUT_SVIDEO, 1540 .type = SAA7134_INPUT_SVIDEO,
1599 .vmux = 8, 1541 .vmux = 8,
@@ -1624,7 +1566,6 @@ struct saa7134_board saa7134_boards[] = {
1624 .type = SAA7134_INPUT_TV, 1566 .type = SAA7134_INPUT_TV,
1625 .vmux = 1, 1567 .vmux = 1,
1626 .amux = LINE2, 1568 .amux = LINE2,
1627 .tv = 1,
1628 }}, 1569 }},
1629 }, 1570 },
1630 [SAA7134_BOARD_EMPIRE_PCI_TV_RADIO_LE] = { 1571 [SAA7134_BOARD_EMPIRE_PCI_TV_RADIO_LE] = {
@@ -1641,7 +1582,6 @@ struct saa7134_board saa7134_boards[] = {
1641 .vmux = 1, 1582 .vmux = 1,
1642 .amux = LINE2, 1583 .amux = LINE2,
1643 .gpio = 0x8000, 1584 .gpio = 0x8000,
1644 .tv = 1,
1645 },{ 1585 },{
1646 .type = SAA7134_INPUT_COMPOSITE1, 1586 .type = SAA7134_INPUT_COMPOSITE1,
1647 .vmux = 3, 1587 .vmux = 3,
@@ -1681,7 +1621,6 @@ struct saa7134_board saa7134_boards[] = {
1681 .type = SAA7134_INPUT_TV, 1621 .type = SAA7134_INPUT_TV,
1682 .vmux = 1, 1622 .vmux = 1,
1683 .amux = TV, 1623 .amux = TV,
1684 .tv = 1,
1685 .gpio = 0x00, 1624 .gpio = 0x00,
1686 },{ 1625 },{
1687 .type = SAA7134_INPUT_COMPOSITE, 1626 .type = SAA7134_INPUT_COMPOSITE,
@@ -1718,7 +1657,6 @@ struct saa7134_board saa7134_boards[] = {
1718 .type = SAA7134_INPUT_TV, 1657 .type = SAA7134_INPUT_TV,
1719 .vmux = 1, 1658 .vmux = 1,
1720 .amux = TV, 1659 .amux = TV,
1721 .tv = 1,
1722 .gpio = 0x01, 1660 .gpio = 0x01,
1723 },{ 1661 },{
1724 .type = SAA7134_INPUT_COMPOSITE1, 1662 .type = SAA7134_INPUT_COMPOSITE1,
@@ -1754,7 +1692,6 @@ struct saa7134_board saa7134_boards[] = {
1754 .type = SAA7134_INPUT_TV, 1692 .type = SAA7134_INPUT_TV,
1755 .vmux = 1, 1693 .vmux = 1,
1756 .amux = TV, 1694 .amux = TV,
1757 .tv = 1,
1758 },{ 1695 },{
1759 .type = SAA7134_INPUT_COMPOSITE1, 1696 .type = SAA7134_INPUT_COMPOSITE1,
1760 .vmux = 3, 1697 .vmux = 3,
@@ -1783,7 +1720,6 @@ struct saa7134_board saa7134_boards[] = {
1783 .type = SAA7134_INPUT_TV, 1720 .type = SAA7134_INPUT_TV,
1784 .vmux = 1, 1721 .vmux = 1,
1785 .amux = TV, 1722 .amux = TV,
1786 .tv = 1,
1787 .gpio = 0x08000000, 1723 .gpio = 0x08000000,
1788 }, { 1724 }, {
1789 .type = SAA7134_INPUT_COMPOSITE1, 1725 .type = SAA7134_INPUT_COMPOSITE1,
@@ -1814,12 +1750,10 @@ struct saa7134_board saa7134_boards[] = {
1814 .type = SAA7134_INPUT_TV, 1750 .type = SAA7134_INPUT_TV,
1815 .vmux = 1, 1751 .vmux = 1,
1816 .amux = TV, 1752 .amux = TV,
1817 .tv = 1,
1818 },{ 1753 },{
1819 .type = SAA7134_INPUT_TV_MONO, 1754 .type = SAA7134_INPUT_TV_MONO,
1820 .vmux = 1, 1755 .vmux = 1,
1821 .amux = LINE2, 1756 .amux = LINE2,
1822 .tv = 1,
1823 },{ 1757 },{
1824 .type = SAA7134_INPUT_COMPOSITE1, 1758 .type = SAA7134_INPUT_COMPOSITE1,
1825 .vmux = 3, 1759 .vmux = 3,
@@ -1843,7 +1777,6 @@ struct saa7134_board saa7134_boards[] = {
1843 .type = SAA7134_INPUT_TV, 1777 .type = SAA7134_INPUT_TV,
1844 .vmux = 1, 1778 .vmux = 1,
1845 .amux = TV, 1779 .amux = TV,
1846 .tv = 1,
1847 },{ 1780 },{
1848 .type = SAA7134_INPUT_COMPOSITE1, 1781 .type = SAA7134_INPUT_COMPOSITE1,
1849 .vmux = 4, 1782 .vmux = 4,
@@ -1885,7 +1818,6 @@ struct saa7134_board saa7134_boards[] = {
1885 .type = SAA7134_INPUT_TV, 1818 .type = SAA7134_INPUT_TV,
1886 .vmux = 1, 1819 .vmux = 1,
1887 .amux = TV, 1820 .amux = TV,
1888 .tv = 1,
1889 .gpio = 0x008080, 1821 .gpio = 0x008080,
1890 }}, 1822 }},
1891 .radio = { 1823 .radio = {
@@ -1912,7 +1844,6 @@ struct saa7134_board saa7134_boards[] = {
1912 .type = SAA7134_INPUT_TV, 1844 .type = SAA7134_INPUT_TV,
1913 .vmux = 3, 1845 .vmux = 3,
1914 .amux = TV, 1846 .amux = TV,
1915 .tv = 1,
1916 },{ 1847 },{
1917 .type = SAA7134_INPUT_COMPOSITE1, 1848 .type = SAA7134_INPUT_COMPOSITE1,
1918 .vmux = 0, 1849 .vmux = 0,
@@ -1944,12 +1875,10 @@ struct saa7134_board saa7134_boards[] = {
1944 .type = SAA7134_INPUT_TV, 1875 .type = SAA7134_INPUT_TV,
1945 .vmux = 1, 1876 .vmux = 1,
1946 .amux = TV, 1877 .amux = TV,
1947 .tv = 1,
1948 },{ 1878 },{
1949 .type = SAA7134_INPUT_TV_MONO, 1879 .type = SAA7134_INPUT_TV_MONO,
1950 .vmux = 1, 1880 .vmux = 1,
1951 .amux = LINE2, 1881 .amux = LINE2,
1952 .tv = 1,
1953 }}, 1882 }},
1954 .radio = { 1883 .radio = {
1955 .type = SAA7134_INPUT_RADIO, 1884 .type = SAA7134_INPUT_RADIO,
@@ -1970,7 +1899,6 @@ struct saa7134_board saa7134_boards[] = {
1970 .type = SAA7134_INPUT_TV, 1899 .type = SAA7134_INPUT_TV,
1971 .vmux = 1, 1900 .vmux = 1,
1972 .amux = LINE2, 1901 .amux = LINE2,
1973 .tv = 1,
1974 },{ 1902 },{
1975 .type = SAA7134_INPUT_COMPOSITE1, 1903 .type = SAA7134_INPUT_COMPOSITE1,
1976 .vmux = 0, 1904 .vmux = 0,
@@ -2005,7 +1933,6 @@ struct saa7134_board saa7134_boards[] = {
2005 .vmux = 1, 1933 .vmux = 1,
2006 .amux = TV, 1934 .amux = TV,
2007 .gpio = 0x200000, /* GPIO21=High for TV input */ 1935 .gpio = 0x200000, /* GPIO21=High for TV input */
2008 .tv = 1,
2009 },{ 1936 },{
2010 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO, 1937 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
2011 .vmux = 0, 1938 .vmux = 0,
@@ -2058,7 +1985,6 @@ struct saa7134_board saa7134_boards[] = {
2058 .type = SAA7134_INPUT_TV, 1985 .type = SAA7134_INPUT_TV,
2059 .vmux = 1, 1986 .vmux = 1,
2060 .amux = TV, 1987 .amux = TV,
2061 .tv = 1,
2062 },{ 1988 },{
2063 .type = SAA7134_INPUT_COMPOSITE1, 1989 .type = SAA7134_INPUT_COMPOSITE1,
2064 .vmux = 0, 1990 .vmux = 0,
@@ -2084,7 +2010,6 @@ struct saa7134_board saa7134_boards[] = {
2084 .type = SAA7134_INPUT_TV, 2010 .type = SAA7134_INPUT_TV,
2085 .vmux = 1, 2011 .vmux = 1,
2086 .amux = TV, 2012 .amux = TV,
2087 .tv = 1,
2088 },{ 2013 },{
2089 .type = SAA7134_INPUT_COMPOSITE1, 2014 .type = SAA7134_INPUT_COMPOSITE1,
2090 .vmux = 3, 2015 .vmux = 3,
@@ -2107,7 +2032,6 @@ struct saa7134_board saa7134_boards[] = {
2107 .type = SAA7134_INPUT_TV, 2032 .type = SAA7134_INPUT_TV,
2108 .vmux = 1, 2033 .vmux = 1,
2109 .amux = TV, 2034 .amux = TV,
2110 .tv = 1,
2111 .gpio = 0x000, 2035 .gpio = 0x000,
2112 },{ 2036 },{
2113 .type = SAA7134_INPUT_COMPOSITE1, 2037 .type = SAA7134_INPUT_COMPOSITE1,
@@ -2145,7 +2069,6 @@ struct saa7134_board saa7134_boards[] = {
2145 .vmux = 1, 2069 .vmux = 1,
2146 .amux = TV, 2070 .amux = TV,
2147 .gpio = 0x200000, /* GPIO21=High for TV input */ 2071 .gpio = 0x200000, /* GPIO21=High for TV input */
2148 .tv = 1,
2149 },{ 2072 },{
2150 .type = SAA7134_INPUT_SVIDEO, 2073 .type = SAA7134_INPUT_SVIDEO,
2151 .vmux = 8, 2074 .vmux = 8,
@@ -2187,7 +2110,6 @@ struct saa7134_board saa7134_boards[] = {
2187 .type = SAA7134_INPUT_TV, 2110 .type = SAA7134_INPUT_TV,
2188 .vmux = 1, 2111 .vmux = 1,
2189 .amux = TV, 2112 .amux = TV,
2190 .tv = 1,
2191 .gpio = 0x800000, 2113 .gpio = 0x800000,
2192 }}, 2114 }},
2193 .radio = { 2115 .radio = {
@@ -2222,7 +2144,6 @@ struct saa7134_board saa7134_boards[] = {
2222 .type = SAA7134_INPUT_TV, 2144 .type = SAA7134_INPUT_TV,
2223 .vmux = 1, 2145 .vmux = 1,
2224 .amux = TV, 2146 .amux = TV,
2225 .tv = 1,
2226 .gpio = 0x000, 2147 .gpio = 0x000,
2227 },{ 2148 },{
2228 .type = SAA7134_INPUT_COMPOSITE1, 2149 .type = SAA7134_INPUT_COMPOSITE1,
@@ -2257,12 +2178,10 @@ struct saa7134_board saa7134_boards[] = {
2257 .type = SAA7134_INPUT_TV, 2178 .type = SAA7134_INPUT_TV,
2258 .vmux = 1, 2179 .vmux = 1,
2259 .amux = TV, 2180 .amux = TV,
2260 .tv = 1,
2261 },{ 2181 },{
2262 .type = SAA7134_INPUT_TV_MONO, 2182 .type = SAA7134_INPUT_TV_MONO,
2263 .vmux = 1, 2183 .vmux = 1,
2264 .amux = LINE2, 2184 .amux = LINE2,
2265 .tv = 1,
2266 },{ 2185 },{
2267 .type = SAA7134_INPUT_COMPOSITE1, 2186 .type = SAA7134_INPUT_COMPOSITE1,
2268 .vmux = 0, 2187 .vmux = 0,
@@ -2296,7 +2215,6 @@ struct saa7134_board saa7134_boards[] = {
2296 .vmux = 1, 2215 .vmux = 1,
2297 .amux = TV, 2216 .amux = TV,
2298 .gpio = 0x0000000, 2217 .gpio = 0x0000000,
2299 .tv = 1,
2300 },{ 2218 },{
2301 .type = SAA7134_INPUT_COMPOSITE1, 2219 .type = SAA7134_INPUT_COMPOSITE1,
2302 .vmux = 3, 2220 .vmux = 3,
@@ -2331,7 +2249,6 @@ struct saa7134_board saa7134_boards[] = {
2331 .type = SAA7134_INPUT_TV, 2249 .type = SAA7134_INPUT_TV,
2332 .vmux = 1, 2250 .vmux = 1,
2333 .amux = TV, 2251 .amux = TV,
2334 .tv = 1,
2335 .gpio = 0x01, 2252 .gpio = 0x01,
2336 },{ 2253 },{
2337 .type = SAA7134_INPUT_COMPOSITE1, 2254 .type = SAA7134_INPUT_COMPOSITE1,
@@ -2371,7 +2288,6 @@ struct saa7134_board saa7134_boards[] = {
2371 .type = SAA7134_INPUT_TV, 2288 .type = SAA7134_INPUT_TV,
2372 .vmux = 3, 2289 .vmux = 3,
2373 .amux = TV, 2290 .amux = TV,
2374 .tv = 1,
2375 },{ 2291 },{
2376 .type = SAA7134_INPUT_COMPOSITE1, 2292 .type = SAA7134_INPUT_COMPOSITE1,
2377 .vmux = 1, 2293 .vmux = 1,
@@ -2401,7 +2317,6 @@ struct saa7134_board saa7134_boards[] = {
2401 .type = SAA7134_INPUT_TV, 2317 .type = SAA7134_INPUT_TV,
2402 .vmux = 1, 2318 .vmux = 1,
2403 .amux = TV, 2319 .amux = TV,
2404 .tv = 1,
2405 .gpio = 0x00200003, 2320 .gpio = 0x00200003,
2406 },{ 2321 },{
2407 .type = SAA7134_INPUT_TV_MONO, 2322 .type = SAA7134_INPUT_TV_MONO,
@@ -2443,7 +2358,6 @@ struct saa7134_board saa7134_boards[] = {
2443 .type = SAA7134_INPUT_TV, 2358 .type = SAA7134_INPUT_TV,
2444 .vmux = 3, 2359 .vmux = 3,
2445 .amux = TV, 2360 .amux = TV,
2446 .tv = 1,
2447 },{ 2361 },{
2448 .type = SAA7134_INPUT_COMPOSITE1, 2362 .type = SAA7134_INPUT_COMPOSITE1,
2449 .vmux = 0, 2363 .vmux = 0,
@@ -2467,7 +2381,6 @@ struct saa7134_board saa7134_boards[] = {
2467 .type = SAA7134_INPUT_TV, 2381 .type = SAA7134_INPUT_TV,
2468 .vmux = 3, 2382 .vmux = 3,
2469 .amux = TV, 2383 .amux = TV,
2470 .tv = 1,
2471 },{ 2384 },{
2472 .type = SAA7134_INPUT_COMPOSITE1, 2385 .type = SAA7134_INPUT_COMPOSITE1,
2473 .vmux = 1, 2386 .vmux = 1,
@@ -2582,7 +2495,6 @@ struct saa7134_board saa7134_boards[] = {
2582 .type = SAA7134_INPUT_TV, 2495 .type = SAA7134_INPUT_TV,
2583 .vmux = 1, 2496 .vmux = 1,
2584 .amux = TV, 2497 .amux = TV,
2585 .tv = 1,
2586 },{ 2498 },{
2587 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO, 2499 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
2588 .vmux = 0, 2500 .vmux = 0,
@@ -2632,7 +2544,6 @@ struct saa7134_board saa7134_boards[] = {
2632 .type = SAA7134_INPUT_TV, 2544 .type = SAA7134_INPUT_TV,
2633 .vmux = 1, 2545 .vmux = 1,
2634 .amux = TV, 2546 .amux = TV,
2635 .tv = 1,
2636 },{ 2547 },{
2637 .type = SAA7134_INPUT_COMPOSITE1, 2548 .type = SAA7134_INPUT_COMPOSITE1,
2638 .vmux = 3, 2549 .vmux = 3,
@@ -2655,7 +2566,6 @@ struct saa7134_board saa7134_boards[] = {
2655 .type = SAA7134_INPUT_TV, 2566 .type = SAA7134_INPUT_TV,
2656 .vmux = 4, 2567 .vmux = 4,
2657 .amux = TV, 2568 .amux = TV,
2658 .tv = 1,
2659 }, { 2569 }, {
2660 .type = SAA7134_INPUT_COMPOSITE1, 2570 .type = SAA7134_INPUT_COMPOSITE1,
2661 .vmux = 1, 2571 .vmux = 1,
@@ -2688,7 +2598,6 @@ struct saa7134_board saa7134_boards[] = {
2688 .type = SAA7134_INPUT_TV, 2598 .type = SAA7134_INPUT_TV,
2689 .vmux = 1, 2599 .vmux = 1,
2690 .amux = TV, 2600 .amux = TV,
2691 .tv = 1,
2692 .gpio = 0x0000000, 2601 .gpio = 0x0000000,
2693 },{ 2602 },{
2694 .type = SAA7134_INPUT_COMPOSITE1, 2603 .type = SAA7134_INPUT_COMPOSITE1,
@@ -2727,7 +2636,6 @@ struct saa7134_board saa7134_boards[] = {
2727 .type = SAA7134_INPUT_TV, 2636 .type = SAA7134_INPUT_TV,
2728 .vmux = 3, 2637 .vmux = 3,
2729 .amux = TV, 2638 .amux = TV,
2730 .tv = 1,
2731 },{ 2639 },{
2732 .type = SAA7134_INPUT_COMPOSITE1, 2640 .type = SAA7134_INPUT_COMPOSITE1,
2733 .vmux = 1, 2641 .vmux = 1,
@@ -2755,7 +2663,6 @@ struct saa7134_board saa7134_boards[] = {
2755 .type = SAA7134_INPUT_TV, 2663 .type = SAA7134_INPUT_TV,
2756 .vmux = 1, 2664 .vmux = 1,
2757 .amux = TV, 2665 .amux = TV,
2758 .tv = 1,
2759 },{ 2666 },{
2760 .type = SAA7134_INPUT_COMPOSITE1, 2667 .type = SAA7134_INPUT_COMPOSITE1,
2761 .vmux = 3, 2668 .vmux = 3,
@@ -2780,7 +2687,6 @@ struct saa7134_board saa7134_boards[] = {
2780 .type = SAA7134_INPUT_TV, 2687 .type = SAA7134_INPUT_TV,
2781 .vmux = 1, 2688 .vmux = 1,
2782 .amux = TV, 2689 .amux = TV,
2783 .tv = 1,
2784 },{ 2690 },{
2785 .type = SAA7134_INPUT_COMPOSITE1, 2691 .type = SAA7134_INPUT_COMPOSITE1,
2786 .vmux = 3, 2692 .vmux = 3,
@@ -2808,7 +2714,6 @@ struct saa7134_board saa7134_boards[] = {
2808 .type = SAA7134_INPUT_TV, 2714 .type = SAA7134_INPUT_TV,
2809 .vmux = 1, 2715 .vmux = 1,
2810 .amux = TV, 2716 .amux = TV,
2811 .tv = 1,
2812 },{ 2717 },{
2813 .type = SAA7134_INPUT_COMPOSITE, 2718 .type = SAA7134_INPUT_COMPOSITE,
2814 .vmux = 3, 2719 .vmux = 3,
@@ -2844,7 +2749,6 @@ struct saa7134_board saa7134_boards[] = {
2844 .type = SAA7134_INPUT_TV, 2749 .type = SAA7134_INPUT_TV,
2845 .vmux = 1, 2750 .vmux = 1,
2846 .amux = TV, 2751 .amux = TV,
2847 .tv = 1,
2848 },{ 2752 },{
2849 .type = SAA7134_INPUT_SVIDEO, /* NOT tested */ 2753 .type = SAA7134_INPUT_SVIDEO, /* NOT tested */
2850 .vmux = 8, 2754 .vmux = 8,
@@ -2872,7 +2776,6 @@ struct saa7134_board saa7134_boards[] = {
2872 .vmux = 1, 2776 .vmux = 1,
2873 .amux = TV, 2777 .amux = TV,
2874 .gpio = 0x200000, /* GPIO21=High for TV input */ 2778 .gpio = 0x200000, /* GPIO21=High for TV input */
2875 .tv = 1,
2876 },{ 2779 },{
2877 .type = SAA7134_INPUT_SVIDEO, 2780 .type = SAA7134_INPUT_SVIDEO,
2878 .vmux = 8, 2781 .vmux = 8,
@@ -2943,7 +2846,6 @@ struct saa7134_board saa7134_boards[] = {
2943 .type = SAA7134_INPUT_TV, 2846 .type = SAA7134_INPUT_TV,
2944 .vmux = 1, 2847 .vmux = 1,
2945 .amux = TV, 2848 .amux = TV,
2946 .tv = 1,
2947 .gpio = 0x00200000, 2849 .gpio = 0x00200000,
2948 }}, 2850 }},
2949 }, 2851 },
@@ -2960,7 +2862,6 @@ struct saa7134_board saa7134_boards[] = {
2960 .type = SAA7134_INPUT_TV, 2862 .type = SAA7134_INPUT_TV,
2961 .vmux = 1, 2863 .vmux = 1,
2962 .amux = TV, 2864 .amux = TV,
2963 .tv = 1,
2964 },{ 2865 },{
2965 .type = SAA7134_INPUT_COMPOSITE1, 2866 .type = SAA7134_INPUT_COMPOSITE1,
2966 .vmux = 3, 2867 .vmux = 3,
@@ -2993,7 +2894,6 @@ struct saa7134_board saa7134_boards[] = {
2993 .type = SAA7134_INPUT_TV, 2894 .type = SAA7134_INPUT_TV,
2994 .vmux = 1, 2895 .vmux = 1,
2995 .amux = TV, 2896 .amux = TV,
2996 .tv = 1,
2997 },{ 2897 },{
2998 .type = SAA7134_INPUT_COMPOSITE1, 2898 .type = SAA7134_INPUT_COMPOSITE1,
2999 .vmux = 3, 2899 .vmux = 3,
@@ -3022,7 +2922,6 @@ struct saa7134_board saa7134_boards[] = {
3022 .type = SAA7134_INPUT_TV, 2922 .type = SAA7134_INPUT_TV,
3023 .vmux = 1, 2923 .vmux = 1,
3024 .amux = TV, 2924 .amux = TV,
3025 .tv = 1,
3026 },{ 2925 },{
3027 .type = SAA7134_INPUT_COMPOSITE1, 2926 .type = SAA7134_INPUT_COMPOSITE1,
3028 .vmux = 3, 2927 .vmux = 3,
@@ -3062,7 +2961,6 @@ struct saa7134_board saa7134_boards[] = {
3062 .type = SAA7134_INPUT_TV, 2961 .type = SAA7134_INPUT_TV,
3063 .vmux = 4, 2962 .vmux = 4,
3064 .amux = TV, 2963 .amux = TV,
3065 .tv = 1,
3066 .gpio = 0x04a61000, 2964 .gpio = 0x04a61000,
3067 },{ 2965 },{
3068 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO, 2966 .type = SAA7134_INPUT_COMPOSITE_OVER_SVIDEO,
@@ -3097,7 +2995,6 @@ struct saa7134_board saa7134_boards[] = {
3097 .vmux = 1, 2995 .vmux = 1,
3098 .amux = TV, 2996 .amux = TV,
3099 .gpio = 0x200000, /* GPIO21=High for TV input */ 2997 .gpio = 0x200000, /* GPIO21=High for TV input */
3100 .tv = 1,
3101 },{ 2998 },{
3102 .type = SAA7134_INPUT_SVIDEO, 2999 .type = SAA7134_INPUT_SVIDEO,
3103 .vmux = 8, 3000 .vmux = 8,
@@ -3132,13 +3029,11 @@ struct saa7134_board saa7134_boards[] = {
3132 .vmux = 1, 3029 .vmux = 1,
3133 .amux = TV, 3030 .amux = TV,
3134 .gpio = 0x8000, 3031 .gpio = 0x8000,
3135 .tv = 1,
3136 },{ 3032 },{
3137 .type = SAA7134_INPUT_TV_MONO, 3033 .type = SAA7134_INPUT_TV_MONO,
3138 .vmux = 1, 3034 .vmux = 1,
3139 .amux = LINE2, 3035 .amux = LINE2,
3140 .gpio = 0x0000, 3036 .gpio = 0x0000,
3141 .tv = 1,
3142 },{ 3037 },{
3143 .type = SAA7134_INPUT_COMPOSITE1, 3038 .type = SAA7134_INPUT_COMPOSITE1,
3144 .vmux = 0, 3039 .vmux = 0,
@@ -3178,7 +3073,6 @@ struct saa7134_board saa7134_boards[] = {
3178 .type = SAA7134_INPUT_TV, 3073 .type = SAA7134_INPUT_TV,
3179 .vmux = 1, 3074 .vmux = 1,
3180 .amux = TV, 3075 .amux = TV,
3181 .tv = 1,
3182 },{ 3076 },{
3183 .type = SAA7134_INPUT_COMPOSITE1, 3077 .type = SAA7134_INPUT_COMPOSITE1,
3184 .vmux = 0, 3078 .vmux = 0,
@@ -3221,7 +3115,6 @@ struct saa7134_board saa7134_boards[] = {
3221 .type = SAA7134_INPUT_TV, 3115 .type = SAA7134_INPUT_TV,
3222 .vmux = 1, 3116 .vmux = 1,
3223 .amux = LINE2, 3117 .amux = LINE2,
3224 .tv = 1,
3225 },{ 3118 },{
3226 .type = SAA7134_INPUT_COMPOSITE1, 3119 .type = SAA7134_INPUT_COMPOSITE1,
3227 .vmux = 0, 3120 .vmux = 0,
@@ -3254,7 +3147,6 @@ struct saa7134_board saa7134_boards[] = {
3254 .type = SAA7134_INPUT_TV, 3147 .type = SAA7134_INPUT_TV,
3255 .vmux = 1, 3148 .vmux = 1,
3256 .amux = TV, 3149 .amux = TV,
3257 .tv = 1,
3258 },{ 3150 },{
3259 .type = SAA7134_INPUT_COMPOSITE1, 3151 .type = SAA7134_INPUT_COMPOSITE1,
3260 .vmux = 3, 3152 .vmux = 3,
@@ -3282,7 +3174,6 @@ struct saa7134_board saa7134_boards[] = {
3282 .type = SAA7134_INPUT_TV, 3174 .type = SAA7134_INPUT_TV,
3283 .vmux = 3, 3175 .vmux = 3,
3284 .amux = TV, 3176 .amux = TV,
3285 .tv = 1,
3286 },{ 3177 },{
3287 .type = SAA7134_INPUT_COMPOSITE1, 3178 .type = SAA7134_INPUT_COMPOSITE1,
3288 .vmux = 4, 3179 .vmux = 4,
@@ -3311,7 +3202,6 @@ struct saa7134_board saa7134_boards[] = {
3311 .type = SAA7134_INPUT_TV, 3202 .type = SAA7134_INPUT_TV,
3312 .vmux = 4, 3203 .vmux = 4,
3313 .amux = TV, 3204 .amux = TV,
3314 .tv = 1,
3315 },{ 3205 },{
3316 .type = SAA7134_INPUT_COMPOSITE1, 3206 .type = SAA7134_INPUT_COMPOSITE1,
3317 .vmux = 1, 3207 .vmux = 1,
@@ -3345,7 +3235,6 @@ struct saa7134_board saa7134_boards[] = {
3345 .type = SAA7134_INPUT_TV, 3235 .type = SAA7134_INPUT_TV,
3346 .vmux = 1, 3236 .vmux = 1,
3347 .amux = TV, 3237 .amux = TV,
3348 .tv = 1,
3349 .gpio = 0x00, 3238 .gpio = 0x00,
3350 },{ 3239 },{
3351 .type = SAA7134_INPUT_COMPOSITE1, 3240 .type = SAA7134_INPUT_COMPOSITE1,
@@ -3388,7 +3277,6 @@ struct saa7134_board saa7134_boards[] = {
3388 .type = SAA7134_INPUT_TV, 3277 .type = SAA7134_INPUT_TV,
3389 .vmux = 3, 3278 .vmux = 3,
3390 .amux = TV, 3279 .amux = TV,
3391 .tv = 1,
3392 },{ 3280 },{
3393 .type = SAA7134_INPUT_COMPOSITE1, 3281 .type = SAA7134_INPUT_COMPOSITE1,
3394 .vmux = 1, 3282 .vmux = 1,
@@ -3415,7 +3303,6 @@ struct saa7134_board saa7134_boards[] = {
3415 .type = SAA7134_INPUT_TV, 3303 .type = SAA7134_INPUT_TV,
3416 .vmux = 1, 3304 .vmux = 1,
3417 .amux = TV, 3305 .amux = TV,
3418 .tv = 1,
3419 .gpio = 0x0000100, 3306 .gpio = 0x0000100,
3420 }, { 3307 }, {
3421 .type = SAA7134_INPUT_COMPOSITE1, 3308 .type = SAA7134_INPUT_COMPOSITE1,
@@ -3448,7 +3335,6 @@ struct saa7134_board saa7134_boards[] = {
3448 .type = SAA7134_INPUT_TV, 3335 .type = SAA7134_INPUT_TV,
3449 .vmux = 1, 3336 .vmux = 1,
3450 .amux = TV, 3337 .amux = TV,
3451 .tv = 1,
3452 .gpio = 0x0000100, 3338 .gpio = 0x0000100,
3453 }, { 3339 }, {
3454 .type = SAA7134_INPUT_COMPOSITE1, 3340 .type = SAA7134_INPUT_COMPOSITE1,
@@ -3480,7 +3366,6 @@ struct saa7134_board saa7134_boards[] = {
3480 .type = SAA7134_INPUT_TV, 3366 .type = SAA7134_INPUT_TV,
3481 .vmux = 1, 3367 .vmux = 1,
3482 .amux = TV, 3368 .amux = TV,
3483 .tv = 1,
3484 .gpio = 0x0000100, 3369 .gpio = 0x0000100,
3485 }, { 3370 }, {
3486 .type = SAA7134_INPUT_COMPOSITE1, 3371 .type = SAA7134_INPUT_COMPOSITE1,
@@ -3509,7 +3394,6 @@ struct saa7134_board saa7134_boards[] = {
3509 .type = SAA7134_INPUT_TV, 3394 .type = SAA7134_INPUT_TV,
3510 .vmux = 1, 3395 .vmux = 1,
3511 .amux = TV, 3396 .amux = TV,
3512 .tv = 1,
3513 },{ 3397 },{
3514 .type = SAA7134_INPUT_COMPOSITE1, 3398 .type = SAA7134_INPUT_COMPOSITE1,
3515 .vmux = 0, 3399 .vmux = 0,
@@ -3533,12 +3417,10 @@ struct saa7134_board saa7134_boards[] = {
3533 .type = SAA7134_INPUT_TV, 3417 .type = SAA7134_INPUT_TV,
3534 .vmux = 1, 3418 .vmux = 1,
3535 .amux = 3, 3419 .amux = 3,
3536 .tv = 1,
3537 },{ 3420 },{
3538 .type = SAA7134_INPUT_TV_MONO, 3421 .type = SAA7134_INPUT_TV_MONO,
3539 .vmux = 7, 3422 .vmux = 7,
3540 .amux = 4, 3423 .amux = 4,
3541 .tv = 1,
3542 },{ 3424 },{
3543 .type = SAA7134_INPUT_COMPOSITE1, 3425 .type = SAA7134_INPUT_COMPOSITE1,
3544 .vmux = 3, 3426 .vmux = 3,
@@ -3572,12 +3454,10 @@ struct saa7134_board saa7134_boards[] = {
3572 .type = SAA7134_INPUT_TV, 3454 .type = SAA7134_INPUT_TV,
3573 .vmux = 1, 3455 .vmux = 1,
3574 .amux = 3, 3456 .amux = 3,
3575 .tv = 1,
3576 },{ 3457 },{
3577 .type = SAA7134_INPUT_TV_MONO, 3458 .type = SAA7134_INPUT_TV_MONO,
3578 .vmux = 7, 3459 .vmux = 7,
3579 .amux = 4, 3460 .amux = 4,
3580 .tv = 1,
3581 },{ 3461 },{
3582 .type = SAA7134_INPUT_COMPOSITE1, 3462 .type = SAA7134_INPUT_COMPOSITE1,
3583 .vmux = 3, 3463 .vmux = 3,
@@ -3610,7 +3490,6 @@ struct saa7134_board saa7134_boards[] = {
3610 .type = SAA7134_INPUT_TV, 3490 .type = SAA7134_INPUT_TV,
3611 .vmux = 1, 3491 .vmux = 1,
3612 .amux = 1, 3492 .amux = 1,
3613 .tv = 1,
3614 .gpio = 0x50000, 3493 .gpio = 0x50000,
3615 }, { 3494 }, {
3616 .type = SAA7134_INPUT_COMPOSITE1, 3495 .type = SAA7134_INPUT_COMPOSITE1,
@@ -3645,7 +3524,6 @@ struct saa7134_board saa7134_boards[] = {
3645 .type = SAA7134_INPUT_TV, 3524 .type = SAA7134_INPUT_TV,
3646 .vmux = 1, 3525 .vmux = 1,
3647 .amux = LINE2, 3526 .amux = LINE2,
3648 .tv = 1,
3649 }, { 3527 }, {
3650 .type = SAA7134_INPUT_COMPOSITE1, 3528 .type = SAA7134_INPUT_COMPOSITE1,
3651 .vmux = 3, 3529 .vmux = 3,
@@ -3678,7 +3556,6 @@ struct saa7134_board saa7134_boards[] = {
3678 .type = SAA7134_INPUT_TV, 3556 .type = SAA7134_INPUT_TV,
3679 .vmux = 1, 3557 .vmux = 1,
3680 .amux = TV, 3558 .amux = TV,
3681 .tv = 1,
3682 },{ 3559 },{
3683 .type = SAA7134_INPUT_COMPOSITE1, 3560 .type = SAA7134_INPUT_COMPOSITE1,
3684 .vmux = 0, 3561 .vmux = 0,
@@ -3703,7 +3580,6 @@ struct saa7134_board saa7134_boards[] = {
3703 .type = SAA7134_INPUT_TV, 3580 .type = SAA7134_INPUT_TV,
3704 .vmux = 1, 3581 .vmux = 1,
3705 .amux = TV, 3582 .amux = TV,
3706 .tv = 1,
3707 },{ 3583 },{
3708 .type = SAA7134_INPUT_COMPOSITE1, 3584 .type = SAA7134_INPUT_COMPOSITE1,
3709 .vmux = 3, 3585 .vmux = 3,
@@ -3731,7 +3607,6 @@ struct saa7134_board saa7134_boards[] = {
3731 .type = SAA7134_INPUT_TV, 3607 .type = SAA7134_INPUT_TV,
3732 .vmux = 1, 3608 .vmux = 1,
3733 .amux = TV, 3609 .amux = TV,
3734 .tv = 1,
3735 },{ 3610 },{
3736 .type = SAA7134_INPUT_COMPOSITE1, 3611 .type = SAA7134_INPUT_COMPOSITE1,
3737 .vmux = 0, 3612 .vmux = 0,
@@ -3756,7 +3631,6 @@ struct saa7134_board saa7134_boards[] = {
3756 .type = SAA7134_INPUT_TV, 3631 .type = SAA7134_INPUT_TV,
3757 .vmux = 1, 3632 .vmux = 1,
3758 .amux = TV, 3633 .amux = TV,
3759 .tv = 1,
3760 .gpio = 0x0200000, 3634 .gpio = 0x0200000,
3761 }}, 3635 }},
3762 }, 3636 },
@@ -3774,7 +3648,6 @@ struct saa7134_board saa7134_boards[] = {
3774 .type = SAA7134_INPUT_TV, 3648 .type = SAA7134_INPUT_TV,
3775 .vmux = 1, 3649 .vmux = 1,
3776 .amux = TV, 3650 .amux = TV,
3777 .tv = 1,
3778 .gpio = 0x0000000, 3651 .gpio = 0x0000000,
3779 },{ 3652 },{
3780 .type = SAA7134_INPUT_COMPOSITE1, 3653 .type = SAA7134_INPUT_COMPOSITE1,
@@ -3810,7 +3683,6 @@ struct saa7134_board saa7134_boards[] = {
3810 .type = SAA7134_INPUT_TV, 3683 .type = SAA7134_INPUT_TV,
3811 .vmux = 1, 3684 .vmux = 1,
3812 .amux = TV, 3685 .amux = TV,
3813 .tv = 1,
3814 .gpio = 0x0000000, 3686 .gpio = 0x0000000,
3815 }, { 3687 }, {
3816 .type = SAA7134_INPUT_COMPOSITE1, 3688 .type = SAA7134_INPUT_COMPOSITE1,
@@ -3842,7 +3714,6 @@ struct saa7134_board saa7134_boards[] = {
3842 .type = SAA7134_INPUT_TV, 3714 .type = SAA7134_INPUT_TV,
3843 .vmux = 1, 3715 .vmux = 1,
3844 .amux = TV, 3716 .amux = TV,
3845 .tv = 1,
3846 },{ 3717 },{
3847 .type = SAA7134_INPUT_COMPOSITE1, 3718 .type = SAA7134_INPUT_COMPOSITE1,
3848 .vmux = 3, 3719 .vmux = 3,
@@ -3875,7 +3746,6 @@ struct saa7134_board saa7134_boards[] = {
3875 .vmux = 1, 3746 .vmux = 1,
3876 .amux = LINE2, 3747 .amux = LINE2,
3877 .gpio = 0x0000, 3748 .gpio = 0x0000,
3878 .tv = 1,
3879 },{ 3749 },{
3880 .type = SAA7134_INPUT_COMPOSITE1, 3750 .type = SAA7134_INPUT_COMPOSITE1,
3881 .vmux = 3, 3751 .vmux = 3,
@@ -3906,7 +3776,6 @@ struct saa7134_board saa7134_boards[] = {
3906 .type = SAA7134_INPUT_TV, /* FIXME: analog tv untested */ 3776 .type = SAA7134_INPUT_TV, /* FIXME: analog tv untested */
3907 .vmux = 1, 3777 .vmux = 1,
3908 .amux = TV, 3778 .amux = TV,
3909 .tv = 1,
3910 }}, 3779 }},
3911 }, 3780 },
3912 [SAA7134_BOARD_AVERMEDIA_M135A] = { 3781 [SAA7134_BOARD_AVERMEDIA_M135A] = {
@@ -3922,7 +3791,6 @@ struct saa7134_board saa7134_boards[] = {
3922 .type = SAA7134_INPUT_TV, 3791 .type = SAA7134_INPUT_TV,
3923 .vmux = 1, 3792 .vmux = 1,
3924 .amux = TV, 3793 .amux = TV,
3925 .tv = 1,
3926 }, { 3794 }, {
3927 .type = SAA7134_INPUT_COMPOSITE1, 3795 .type = SAA7134_INPUT_COMPOSITE1,
3928 .vmux = 3, 3796 .vmux = 3,
@@ -3956,7 +3824,6 @@ struct saa7134_board saa7134_boards[] = {
3956 .type = SAA7134_INPUT_TV, 3824 .type = SAA7134_INPUT_TV,
3957 .vmux = 1, 3825 .vmux = 1,
3958 .amux = TV, 3826 .amux = TV,
3959 .tv = 1,
3960 }, { 3827 }, {
3961 .type = SAA7134_INPUT_COMPOSITE1, 3828 .type = SAA7134_INPUT_COMPOSITE1,
3962 .vmux = 3, 3829 .vmux = 3,
@@ -3999,7 +3866,6 @@ struct saa7134_board saa7134_boards[] = {
3999 .type = SAA7134_INPUT_TV, 3866 .type = SAA7134_INPUT_TV,
4000 .vmux = 3, 3867 .vmux = 3,
4001 .amux = LINE2, 3868 .amux = LINE2,
4002 .tv = 1,
4003 }}, 3869 }},
4004 .mute = { 3870 .mute = {
4005 .type = SAA7134_INPUT_MUTE, 3871 .type = SAA7134_INPUT_MUTE,
@@ -4028,7 +3894,6 @@ struct saa7134_board saa7134_boards[] = {
4028 .type = SAA7134_INPUT_TV, 3894 .type = SAA7134_INPUT_TV,
4029 .vmux = 3, 3895 .vmux = 3,
4030 .amux = LINE2, 3896 .amux = LINE2,
4031 .tv = 1,
4032 }}, 3897 }},
4033 }, 3898 },
4034 [SAA7134_BOARD_BEHOLD_403FM] = { 3899 [SAA7134_BOARD_BEHOLD_403FM] = {
@@ -4053,7 +3918,6 @@ struct saa7134_board saa7134_boards[] = {
4053 .type = SAA7134_INPUT_TV, 3918 .type = SAA7134_INPUT_TV,
4054 .vmux = 3, 3919 .vmux = 3,
4055 .amux = LINE2, 3920 .amux = LINE2,
4056 .tv = 1,
4057 }}, 3921 }},
4058 .radio = { 3922 .radio = {
4059 .type = SAA7134_INPUT_RADIO, 3923 .type = SAA7134_INPUT_RADIO,
@@ -4083,7 +3947,6 @@ struct saa7134_board saa7134_boards[] = {
4083 .type = SAA7134_INPUT_TV, 3947 .type = SAA7134_INPUT_TV,
4084 .vmux = 3, 3948 .vmux = 3,
4085 .amux = LINE2, 3949 .amux = LINE2,
4086 .tv = 1,
4087 }}, 3950 }},
4088 }, 3951 },
4089 [SAA7134_BOARD_BEHOLD_405FM] = { 3952 [SAA7134_BOARD_BEHOLD_405FM] = {
@@ -4110,7 +3973,6 @@ struct saa7134_board saa7134_boards[] = {
4110 .type = SAA7134_INPUT_TV, 3973 .type = SAA7134_INPUT_TV,
4111 .vmux = 3, 3974 .vmux = 3,
4112 .amux = LINE2, 3975 .amux = LINE2,
4113 .tv = 1,
4114 }}, 3976 }},
4115 .radio = { 3977 .radio = {
4116 .type = SAA7134_INPUT_RADIO, 3978 .type = SAA7134_INPUT_RADIO,
@@ -4142,7 +4004,6 @@ struct saa7134_board saa7134_boards[] = {
4142 .type = SAA7134_INPUT_TV, 4004 .type = SAA7134_INPUT_TV,
4143 .vmux = 3, 4005 .vmux = 3,
4144 .amux = TV, 4006 .amux = TV,
4145 .tv = 1,
4146 .gpio = 0xc0c000, 4007 .gpio = 0xc0c000,
4147 }}, 4008 }},
4148 }, 4009 },
@@ -4171,7 +4032,6 @@ struct saa7134_board saa7134_boards[] = {
4171 .type = SAA7134_INPUT_TV, 4032 .type = SAA7134_INPUT_TV,
4172 .vmux = 3, 4033 .vmux = 3,
4173 .amux = TV, 4034 .amux = TV,
4174 .tv = 1,
4175 .gpio = 0xc0c000, 4035 .gpio = 0xc0c000,
4176 }}, 4036 }},
4177 .radio = { 4037 .radio = {
@@ -4195,7 +4055,6 @@ struct saa7134_board saa7134_boards[] = {
4195 .type = SAA7134_INPUT_TV, 4055 .type = SAA7134_INPUT_TV,
4196 .vmux = 3, 4056 .vmux = 3,
4197 .amux = TV, 4057 .amux = TV,
4198 .tv = 1,
4199 },{ 4058 },{
4200 .type = SAA7134_INPUT_COMPOSITE1, 4059 .type = SAA7134_INPUT_COMPOSITE1,
4201 .vmux = 1, 4060 .vmux = 1,
@@ -4221,7 +4080,6 @@ struct saa7134_board saa7134_boards[] = {
4221 .type = SAA7134_INPUT_TV, 4080 .type = SAA7134_INPUT_TV,
4222 .vmux = 3, 4081 .vmux = 3,
4223 .amux = LINE2, 4082 .amux = LINE2,
4224 .tv = 1,
4225 }, { 4083 }, {
4226 .type = SAA7134_INPUT_COMPOSITE1, 4084 .type = SAA7134_INPUT_COMPOSITE1,
4227 .vmux = 1, 4085 .vmux = 1,
@@ -4256,7 +4114,6 @@ struct saa7134_board saa7134_boards[] = {
4256 .type = SAA7134_INPUT_TV, 4114 .type = SAA7134_INPUT_TV,
4257 .vmux = 3, 4115 .vmux = 3,
4258 .amux = LINE2, 4116 .amux = LINE2,
4259 .tv = 1,
4260 },{ 4117 },{
4261 .type = SAA7134_INPUT_COMPOSITE1, 4118 .type = SAA7134_INPUT_COMPOSITE1,
4262 .vmux = 1, 4119 .vmux = 1,
@@ -4290,7 +4147,6 @@ struct saa7134_board saa7134_boards[] = {
4290 .type = SAA7134_INPUT_TV, 4147 .type = SAA7134_INPUT_TV,
4291 .vmux = 3, 4148 .vmux = 3,
4292 .amux = TV, 4149 .amux = TV,
4293 .tv = 1,
4294 },{ 4150 },{
4295 .type = SAA7134_INPUT_COMPOSITE1, 4151 .type = SAA7134_INPUT_COMPOSITE1,
4296 .vmux = 1, 4152 .vmux = 1,
@@ -4321,7 +4177,6 @@ struct saa7134_board saa7134_boards[] = {
4321 .type = SAA7134_INPUT_TV, 4177 .type = SAA7134_INPUT_TV,
4322 .vmux = 3, 4178 .vmux = 3,
4323 .amux = TV, 4179 .amux = TV,
4324 .tv = 1,
4325 }, { 4180 }, {
4326 .type = SAA7134_INPUT_COMPOSITE1, 4181 .type = SAA7134_INPUT_COMPOSITE1,
4327 .vmux = 1, 4182 .vmux = 1,
@@ -4352,7 +4207,6 @@ struct saa7134_board saa7134_boards[] = {
4352 .type = SAA7134_INPUT_TV, 4207 .type = SAA7134_INPUT_TV,
4353 .vmux = 3, 4208 .vmux = 3,
4354 .amux = TV, 4209 .amux = TV,
4355 .tv = 1,
4356 }, { 4210 }, {
4357 .type = SAA7134_INPUT_COMPOSITE1, 4211 .type = SAA7134_INPUT_COMPOSITE1,
4358 .vmux = 1, 4212 .vmux = 1,
@@ -4382,7 +4236,6 @@ struct saa7134_board saa7134_boards[] = {
4382 .type = SAA7134_INPUT_TV, 4236 .type = SAA7134_INPUT_TV,
4383 .vmux = 3, 4237 .vmux = 3,
4384 .amux = TV, 4238 .amux = TV,
4385 .tv = 1,
4386 .gpio = 0x000A8004, 4239 .gpio = 0x000A8004,
4387 }, { 4240 }, {
4388 .type = SAA7134_INPUT_COMPOSITE1, 4241 .type = SAA7134_INPUT_COMPOSITE1,
@@ -4414,7 +4267,6 @@ struct saa7134_board saa7134_boards[] = {
4414 .type = SAA7134_INPUT_TV, 4267 .type = SAA7134_INPUT_TV,
4415 .vmux = 3, 4268 .vmux = 3,
4416 .amux = TV, 4269 .amux = TV,
4417 .tv = 1,
4418 }, { 4270 }, {
4419 .type = SAA7134_INPUT_COMPOSITE1, 4271 .type = SAA7134_INPUT_COMPOSITE1,
4420 .vmux = 1, 4272 .vmux = 1,
@@ -4442,7 +4294,6 @@ struct saa7134_board saa7134_boards[] = {
4442 .type = SAA7134_INPUT_TV, 4294 .type = SAA7134_INPUT_TV,
4443 .vmux = 3, 4295 .vmux = 3,
4444 .amux = TV, 4296 .amux = TV,
4445 .tv = 1,
4446 }, { 4297 }, {
4447 .type = SAA7134_INPUT_COMPOSITE1, 4298 .type = SAA7134_INPUT_COMPOSITE1,
4448 .vmux = 1, 4299 .vmux = 1,
@@ -4470,7 +4321,6 @@ struct saa7134_board saa7134_boards[] = {
4470 .type = SAA7134_INPUT_TV, 4321 .type = SAA7134_INPUT_TV,
4471 .vmux = 3, 4322 .vmux = 3,
4472 .amux = TV, 4323 .amux = TV,
4473 .tv = 1,
4474 }, { 4324 }, {
4475 .type = SAA7134_INPUT_COMPOSITE1, 4325 .type = SAA7134_INPUT_COMPOSITE1,
4476 .vmux = 1, 4326 .vmux = 1,
@@ -4498,7 +4348,6 @@ struct saa7134_board saa7134_boards[] = {
4498 .type = SAA7134_INPUT_TV, 4348 .type = SAA7134_INPUT_TV,
4499 .vmux = 3, 4349 .vmux = 3,
4500 .amux = TV, 4350 .amux = TV,
4501 .tv = 1,
4502 }, { 4351 }, {
4503 .type = SAA7134_INPUT_COMPOSITE1, 4352 .type = SAA7134_INPUT_COMPOSITE1,
4504 .vmux = 1, 4353 .vmux = 1,
@@ -4527,7 +4376,6 @@ struct saa7134_board saa7134_boards[] = {
4527 .type = SAA7134_INPUT_TV, 4376 .type = SAA7134_INPUT_TV,
4528 .vmux = 3, 4377 .vmux = 3,
4529 .amux = TV, 4378 .amux = TV,
4530 .tv = 1,
4531 }, { 4379 }, {
4532 .type = SAA7134_INPUT_COMPOSITE1, 4380 .type = SAA7134_INPUT_COMPOSITE1,
4533 .vmux = 1, 4381 .vmux = 1,
@@ -4556,7 +4404,6 @@ struct saa7134_board saa7134_boards[] = {
4556 .type = SAA7134_INPUT_TV, 4404 .type = SAA7134_INPUT_TV,
4557 .vmux = 3, 4405 .vmux = 3,
4558 .amux = TV, 4406 .amux = TV,
4559 .tv = 1,
4560 }, { 4407 }, {
4561 .type = SAA7134_INPUT_COMPOSITE1, 4408 .type = SAA7134_INPUT_COMPOSITE1,
4562 .vmux = 1, 4409 .vmux = 1,
@@ -4585,7 +4432,6 @@ struct saa7134_board saa7134_boards[] = {
4585 .type = SAA7134_INPUT_TV, 4432 .type = SAA7134_INPUT_TV,
4586 .vmux = 3, 4433 .vmux = 3,
4587 .amux = TV, 4434 .amux = TV,
4588 .tv = 1,
4589 }, { 4435 }, {
4590 .type = SAA7134_INPUT_COMPOSITE1, 4436 .type = SAA7134_INPUT_COMPOSITE1,
4591 .vmux = 1, 4437 .vmux = 1,
@@ -4614,7 +4460,6 @@ struct saa7134_board saa7134_boards[] = {
4614 .type = SAA7134_INPUT_TV, 4460 .type = SAA7134_INPUT_TV,
4615 .vmux = 3, 4461 .vmux = 3,
4616 .amux = TV, 4462 .amux = TV,
4617 .tv = 1,
4618 },{ 4463 },{
4619 .type = SAA7134_INPUT_COMPOSITE1, 4464 .type = SAA7134_INPUT_COMPOSITE1,
4620 .vmux = 1, 4465 .vmux = 1,
@@ -4646,7 +4491,6 @@ struct saa7134_board saa7134_boards[] = {
4646 .type = SAA7134_INPUT_TV, 4491 .type = SAA7134_INPUT_TV,
4647 .vmux = 3, 4492 .vmux = 3,
4648 .amux = TV, 4493 .amux = TV,
4649 .tv = 1,
4650 }, { 4494 }, {
4651 .type = SAA7134_INPUT_COMPOSITE1, 4495 .type = SAA7134_INPUT_COMPOSITE1,
4652 .vmux = 1, 4496 .vmux = 1,
@@ -4683,7 +4527,6 @@ struct saa7134_board saa7134_boards[] = {
4683 .type = SAA7134_INPUT_TV, 4527 .type = SAA7134_INPUT_TV,
4684 .vmux = 3, 4528 .vmux = 3,
4685 .amux = TV, 4529 .amux = TV,
4686 .tv = 1,
4687 }, { 4530 }, {
4688 .type = SAA7134_INPUT_COMPOSITE1, 4531 .type = SAA7134_INPUT_COMPOSITE1,
4689 .vmux = 1, 4532 .vmux = 1,
@@ -4722,7 +4565,6 @@ struct saa7134_board saa7134_boards[] = {
4722 .type = SAA7134_INPUT_TV, 4565 .type = SAA7134_INPUT_TV,
4723 .vmux = 3, 4566 .vmux = 3,
4724 .amux = TV, 4567 .amux = TV,
4725 .tv = 1,
4726 }, { 4568 }, {
4727 .type = SAA7134_INPUT_COMPOSITE1, 4569 .type = SAA7134_INPUT_COMPOSITE1,
4728 .vmux = 1, 4570 .vmux = 1,
@@ -4757,7 +4599,6 @@ struct saa7134_board saa7134_boards[] = {
4757 .type = SAA7134_INPUT_TV, 4599 .type = SAA7134_INPUT_TV,
4758 .vmux = 1, 4600 .vmux = 1,
4759 .amux = TV, 4601 .amux = TV,
4760 .tv = 1,
4761 }, { 4602 }, {
4762 .type = SAA7134_INPUT_COMPOSITE1, 4603 .type = SAA7134_INPUT_COMPOSITE1,
4763 .vmux = 3, 4604 .vmux = 3,
@@ -4787,13 +4628,11 @@ struct saa7134_board saa7134_boards[] = {
4787 .vmux = 1, 4628 .vmux = 1,
4788 .amux = LINE2, 4629 .amux = LINE2,
4789 .gpio = 0x0000, 4630 .gpio = 0x0000,
4790 .tv = 1,
4791 }, { 4631 }, {
4792 .type = SAA7134_INPUT_COMPOSITE1, 4632 .type = SAA7134_INPUT_COMPOSITE1,
4793 .vmux = 3, 4633 .vmux = 3,
4794 .amux = LINE1, 4634 .amux = LINE1,
4795 .gpio = 0x2000, 4635 .gpio = 0x2000,
4796 .tv = 1
4797 }, { 4636 }, {
4798 .type = SAA7134_INPUT_SVIDEO, 4637 .type = SAA7134_INPUT_SVIDEO,
4799 .vmux = 8, 4638 .vmux = 8,
@@ -4842,7 +4681,6 @@ struct saa7134_board saa7134_boards[] = {
4842 .type = SAA7134_INPUT_TV, 4681 .type = SAA7134_INPUT_TV,
4843 .vmux = 1, 4682 .vmux = 1,
4844 .amux = TV, 4683 .amux = TV,
4845 .tv = 1,
4846 }, { 4684 }, {
4847 .type = SAA7134_INPUT_COMPOSITE1, 4685 .type = SAA7134_INPUT_COMPOSITE1,
4848 .vmux = 0, 4686 .vmux = 0,
@@ -4867,7 +4705,6 @@ struct saa7134_board saa7134_boards[] = {
4867 .type = SAA7134_INPUT_TV, 4705 .type = SAA7134_INPUT_TV,
4868 .vmux = 1, 4706 .vmux = 1,
4869 .amux = TV, 4707 .amux = TV,
4870 .tv = 1,
4871 }, { 4708 }, {
4872 .type = SAA7134_INPUT_COMPOSITE1, 4709 .type = SAA7134_INPUT_COMPOSITE1,
4873 .vmux = 3, 4710 .vmux = 3,
@@ -4895,7 +4732,6 @@ struct saa7134_board saa7134_boards[] = {
4895 .type = SAA7134_INPUT_TV, 4732 .type = SAA7134_INPUT_TV,
4896 .vmux = 1, 4733 .vmux = 1,
4897 .amux = TV, 4734 .amux = TV,
4898 .tv = 1,
4899 }, { 4735 }, {
4900 .type = SAA7134_INPUT_COMPOSITE1, 4736 .type = SAA7134_INPUT_COMPOSITE1,
4901 .vmux = 3, 4737 .vmux = 3,
@@ -4922,7 +4758,6 @@ struct saa7134_board saa7134_boards[] = {
4922 .type = SAA7134_INPUT_TV, 4758 .type = SAA7134_INPUT_TV,
4923 .vmux = 1, 4759 .vmux = 1,
4924 .amux = TV, 4760 .amux = TV,
4925 .tv = 1,
4926 }, { 4761 }, {
4927 .type = SAA7134_INPUT_SVIDEO, 4762 .type = SAA7134_INPUT_SVIDEO,
4928 .vmux = 8, 4763 .vmux = 8,
@@ -4948,7 +4783,6 @@ struct saa7134_board saa7134_boards[] = {
4948 .type = SAA7134_INPUT_TV, 4783 .type = SAA7134_INPUT_TV,
4949 .vmux = 1, 4784 .vmux = 1,
4950 .amux = TV, 4785 .amux = TV,
4951 .tv = 1,
4952 }, { 4786 }, {
4953 .type = SAA7134_INPUT_COMPOSITE1, 4787 .type = SAA7134_INPUT_COMPOSITE1,
4954 .vmux = 3, 4788 .vmux = 3,
@@ -4972,7 +4806,6 @@ struct saa7134_board saa7134_boards[] = {
4972 .type = SAA7134_INPUT_TV, 4806 .type = SAA7134_INPUT_TV,
4973 .vmux = 3, 4807 .vmux = 3,
4974 .amux = TV, 4808 .amux = TV,
4975 .tv = 1,
4976 }, { 4809 }, {
4977 .type = SAA7134_INPUT_COMPOSITE1, 4810 .type = SAA7134_INPUT_COMPOSITE1,
4978 .vmux = 1, 4811 .vmux = 1,
@@ -5019,7 +4852,6 @@ struct saa7134_board saa7134_boards[] = {
5019 .type = SAA7134_INPUT_TV, 4852 .type = SAA7134_INPUT_TV,
5020 .vmux = 4, 4853 .vmux = 4,
5021 .amux = TV, 4854 .amux = TV,
5022 .tv = 1,
5023 }, { 4855 }, {
5024 .type = SAA7134_INPUT_COMPOSITE, 4856 .type = SAA7134_INPUT_COMPOSITE,
5025 .vmux = 1, 4857 .vmux = 1,
@@ -5048,7 +4880,6 @@ struct saa7134_board saa7134_boards[] = {
5048 .type = SAA7134_INPUT_TV, 4880 .type = SAA7134_INPUT_TV,
5049 .vmux = 3, 4881 .vmux = 3,
5050 .amux = TV, 4882 .amux = TV,
5051 .tv = 1,
5052 }, { 4883 }, {
5053 .type = SAA7134_INPUT_COMPOSITE1, 4884 .type = SAA7134_INPUT_COMPOSITE1,
5054 .vmux = 1, 4885 .vmux = 1,
@@ -5077,7 +4908,6 @@ struct saa7134_board saa7134_boards[] = {
5077 .type = SAA7134_INPUT_TV, 4908 .type = SAA7134_INPUT_TV,
5078 .vmux = 1, 4909 .vmux = 1,
5079 .amux = TV, 4910 .amux = TV,
5080 .tv = 1,
5081 }, { 4911 }, {
5082 .type = SAA7134_INPUT_COMPOSITE, 4912 .type = SAA7134_INPUT_COMPOSITE,
5083 .vmux = 0, 4913 .vmux = 0,
@@ -5107,7 +4937,6 @@ struct saa7134_board saa7134_boards[] = {
5107 .type = SAA7134_INPUT_TV, 4937 .type = SAA7134_INPUT_TV,
5108 .vmux = 1, 4938 .vmux = 1,
5109 .amux = TV, 4939 .amux = TV,
5110 .tv = 1,
5111 }, { 4940 }, {
5112 .type = SAA7134_INPUT_COMPOSITE, 4941 .type = SAA7134_INPUT_COMPOSITE,
5113 .vmux = 0, 4942 .vmux = 0,
@@ -5135,7 +4964,6 @@ struct saa7134_board saa7134_boards[] = {
5135 .type = SAA7134_INPUT_TV, 4964 .type = SAA7134_INPUT_TV,
5136 .vmux = 3, 4965 .vmux = 3,
5137 .amux = LINE2, 4966 .amux = LINE2,
5138 .tv = 1,
5139 .gpio = 0x624000, 4967 .gpio = 0x624000,
5140 }, { 4968 }, {
5141 .type = SAA7134_INPUT_COMPOSITE1, 4969 .type = SAA7134_INPUT_COMPOSITE1,
@@ -5171,7 +4999,6 @@ struct saa7134_board saa7134_boards[] = {
5171 .type = SAA7134_INPUT_TV, 4999 .type = SAA7134_INPUT_TV,
5172 .vmux = 1, 5000 .vmux = 1,
5173 .amux = TV, 5001 .amux = TV,
5174 .tv = 1,
5175 }, { 5002 }, {
5176 .type = SAA7134_INPUT_COMPOSITE, 5003 .type = SAA7134_INPUT_COMPOSITE,
5177 .vmux = 4, 5004 .vmux = 4,
@@ -5196,7 +5023,6 @@ struct saa7134_board saa7134_boards[] = {
5196 .type = SAA7134_INPUT_TV, 5023 .type = SAA7134_INPUT_TV,
5197 .vmux = 1, 5024 .vmux = 1,
5198 .amux = TV, 5025 .amux = TV,
5199 .tv = 1,
5200 }, { 5026 }, {
5201 .type = SAA7134_INPUT_COMPOSITE1, 5027 .type = SAA7134_INPUT_COMPOSITE1,
5202 .vmux = 3, 5028 .vmux = 3,
@@ -5228,7 +5054,6 @@ struct saa7134_board saa7134_boards[] = {
5228 .type = SAA7134_INPUT_TV, 5054 .type = SAA7134_INPUT_TV,
5229 .vmux = 1, 5055 .vmux = 1,
5230 .amux = LINE2, 5056 .amux = LINE2,
5231 .tv = 1,
5232 .gpio = 0x100, 5057 .gpio = 0x100,
5233 }, { 5058 }, {
5234 .type = SAA7134_INPUT_COMPOSITE1, 5059 .type = SAA7134_INPUT_COMPOSITE1,
@@ -5267,7 +5092,6 @@ struct saa7134_board saa7134_boards[] = {
5267 .type = SAA7134_INPUT_TV, 5092 .type = SAA7134_INPUT_TV,
5268 .vmux = 1, 5093 .vmux = 1,
5269 .amux = TV, 5094 .amux = TV,
5270 .tv = 1,
5271#if 0 /* FIXME */ 5095#if 0 /* FIXME */
5272 }, { 5096 }, {
5273 .type = SAA7134_INPUT_COMPOSITE1, 5097 .type = SAA7134_INPUT_COMPOSITE1,
@@ -5308,7 +5132,6 @@ struct saa7134_board saa7134_boards[] = {
5308 .type = SAA7134_INPUT_TV, 5132 .type = SAA7134_INPUT_TV,
5309 .vmux = 1, 5133 .vmux = 1,
5310 .amux = TV, 5134 .amux = TV,
5311 .tv = 1,
5312 .gpio = 0x01, 5135 .gpio = 0x01,
5313 }, { 5136 }, {
5314 .type = SAA7134_INPUT_SVIDEO, 5137 .type = SAA7134_INPUT_SVIDEO,
@@ -5341,7 +5164,6 @@ struct saa7134_board saa7134_boards[] = {
5341 .type = SAA7134_INPUT_TV, 5164 .type = SAA7134_INPUT_TV,
5342 .vmux = 1, 5165 .vmux = 1,
5343 .amux = TV, 5166 .amux = TV,
5344 .tv = 1,
5345 .gpio = 0x00, 5167 .gpio = 0x00,
5346 }, { 5168 }, {
5347 .type = SAA7134_INPUT_COMPOSITE1, 5169 .type = SAA7134_INPUT_COMPOSITE1,
@@ -5397,7 +5219,6 @@ struct saa7134_board saa7134_boards[] = {
5397 .type = SAA7134_INPUT_TV, 5219 .type = SAA7134_INPUT_TV,
5398 .vmux = 2, 5220 .vmux = 2,
5399 .amux = TV, 5221 .amux = TV,
5400 .tv = 1,
5401 }, { 5222 }, {
5402 .type = SAA7134_INPUT_COMPOSITE1, 5223 .type = SAA7134_INPUT_COMPOSITE1,
5403 .vmux = 0, 5224 .vmux = 0,
@@ -5426,7 +5247,6 @@ struct saa7134_board saa7134_boards[] = {
5426 .type = SAA7134_INPUT_TV, 5247 .type = SAA7134_INPUT_TV,
5427 .vmux = 1, 5248 .vmux = 1,
5428 .amux = TV, 5249 .amux = TV,
5429 .tv = 1,
5430 } }, 5250 } },
5431 .radio = { /* untested */ 5251 .radio = { /* untested */
5432 .type = SAA7134_INPUT_RADIO, 5252 .type = SAA7134_INPUT_RADIO,
@@ -5446,7 +5266,6 @@ struct saa7134_board saa7134_boards[] = {
5446 .type = SAA7134_INPUT_TV, 5266 .type = SAA7134_INPUT_TV,
5447 .vmux = 3, 5267 .vmux = 3,
5448 .amux = TV, 5268 .amux = TV,
5449 .tv = 1,
5450 }, { 5269 }, {
5451 .type = SAA7134_INPUT_COMPOSITE1, 5270 .type = SAA7134_INPUT_COMPOSITE1,
5452 .vmux = 4, 5271 .vmux = 4,
@@ -5489,7 +5308,6 @@ struct saa7134_board saa7134_boards[] = {
5489 .type = SAA7134_INPUT_TV, 5308 .type = SAA7134_INPUT_TV,
5490 .vmux = 3, 5309 .vmux = 3,
5491 .amux = LINE2, 5310 .amux = LINE2,
5492 .tv = 1,
5493 }, { 5311 }, {
5494 .type = SAA7134_INPUT_COMPOSITE1, 5312 .type = SAA7134_INPUT_COMPOSITE1,
5495 .vmux = 1, 5313 .vmux = 1,
@@ -5539,7 +5357,6 @@ struct saa7134_board saa7134_boards[] = {
5539 .type = SAA7134_INPUT_TV, 5357 .type = SAA7134_INPUT_TV,
5540 .vmux = 2, 5358 .vmux = 2,
5541 .amux = TV, 5359 .amux = TV,
5542 .tv = 1,
5543 }, { 5360 }, {
5544 .type = SAA7134_INPUT_COMPOSITE1, 5361 .type = SAA7134_INPUT_COMPOSITE1,
5545 .vmux = 0, 5362 .vmux = 0,
@@ -5566,7 +5383,6 @@ struct saa7134_board saa7134_boards[] = {
5566 .type = SAA7134_INPUT_TV, 5383 .type = SAA7134_INPUT_TV,
5567 .vmux = 2, 5384 .vmux = 2,
5568 .amux = TV, 5385 .amux = TV,
5569 .tv = 1,
5570 }, { 5386 }, {
5571 .type = SAA7134_INPUT_COMPOSITE1, 5387 .type = SAA7134_INPUT_COMPOSITE1,
5572 .vmux = 0, 5388 .vmux = 0,
@@ -5594,7 +5410,6 @@ struct saa7134_board saa7134_boards[] = {
5594 .type = SAA7134_INPUT_TV, 5410 .type = SAA7134_INPUT_TV,
5595 .vmux = 3, 5411 .vmux = 3,
5596 .amux = TV, 5412 .amux = TV,
5597 .tv = 1,
5598 }, { 5413 }, {
5599 .type = SAA7134_INPUT_COMPOSITE1, 5414 .type = SAA7134_INPUT_COMPOSITE1,
5600 .vmux = 0, 5415 .vmux = 0,
@@ -5617,7 +5432,6 @@ struct saa7134_board saa7134_boards[] = {
5617 .type = SAA7134_INPUT_TV, 5432 .type = SAA7134_INPUT_TV,
5618 .vmux = 1, 5433 .vmux = 1,
5619 .amux = TV, 5434 .amux = TV,
5620 .tv = 1,
5621 }, { 5435 }, {
5622 .type = SAA7134_INPUT_COMPOSITE1, 5436 .type = SAA7134_INPUT_COMPOSITE1,
5623 .vmux = 3, 5437 .vmux = 3,
@@ -5652,7 +5466,6 @@ struct saa7134_board saa7134_boards[] = {
5652 .type = SAA7134_INPUT_TV, 5466 .type = SAA7134_INPUT_TV,
5653 .vmux = 1, 5467 .vmux = 1,
5654 .amux = TV, 5468 .amux = TV,
5655 .tv = 1,
5656 .gpio = 0x00050000, 5469 .gpio = 0x00050000,
5657 }, { 5470 }, {
5658 .type = SAA7134_INPUT_COMPOSITE1, 5471 .type = SAA7134_INPUT_COMPOSITE1,
@@ -5691,7 +5504,6 @@ struct saa7134_board saa7134_boards[] = {
5691 .type = SAA7134_INPUT_TV, 5504 .type = SAA7134_INPUT_TV,
5692 .vmux = 3, 5505 .vmux = 3,
5693 .amux = LINE2, 5506 .amux = LINE2,
5694 .tv = 1,
5695 }, { 5507 }, {
5696 .type = SAA7134_INPUT_COMPOSITE1, 5508 .type = SAA7134_INPUT_COMPOSITE1,
5697 .vmux = 1, 5509 .vmux = 1,
@@ -5720,7 +5532,6 @@ struct saa7134_board saa7134_boards[] = {
5720 .type = SAA7134_INPUT_TV, 5532 .type = SAA7134_INPUT_TV,
5721 .vmux = 3, 5533 .vmux = 3,
5722 .amux = LINE2, 5534 .amux = LINE2,
5723 .tv = 1,
5724 }, { 5535 }, {
5725 .type = SAA7134_INPUT_COMPOSITE1, 5536 .type = SAA7134_INPUT_COMPOSITE1,
5726 .vmux = 1, 5537 .vmux = 1,
@@ -5770,7 +5581,6 @@ struct saa7134_board saa7134_boards[] = {
5770 .type = SAA7134_INPUT_TV, 5581 .type = SAA7134_INPUT_TV,
5771 .vmux = 1, 5582 .vmux = 1,
5772 .amux = TV, 5583 .amux = TV,
5773 .tv = 1,
5774 }, { 5584 }, {
5775 .type = SAA7134_INPUT_COMPOSITE, 5585 .type = SAA7134_INPUT_COMPOSITE,
5776 .vmux = 3, 5586 .vmux = 3,
@@ -5819,7 +5629,6 @@ struct saa7134_board saa7134_boards[] = {
5819 .type = SAA7134_INPUT_TV, 5629 .type = SAA7134_INPUT_TV,
5820 .vmux = 1, 5630 .vmux = 1,
5821 .amux = TV, 5631 .amux = TV,
5822 .tv = 1,
5823 }, { 5632 }, {
5824 .type = SAA7134_INPUT_COMPOSITE, 5633 .type = SAA7134_INPUT_COMPOSITE,
5825 .vmux = 4, 5634 .vmux = 4,
@@ -5851,7 +5660,6 @@ struct saa7134_board saa7134_boards[] = {
5851 .type = SAA7134_INPUT_TV, 5660 .type = SAA7134_INPUT_TV,
5852 .vmux = 3, 5661 .vmux = 3,
5853 .amux = TV, 5662 .amux = TV,
5854 .tv = 1,
5855 }, { 5663 }, {
5856 .type = SAA7134_INPUT_SVIDEO, 5664 .type = SAA7134_INPUT_SVIDEO,
5857 .vmux = 6, 5665 .vmux = 6,
@@ -5872,7 +5680,6 @@ struct saa7134_board saa7134_boards[] = {
5872 .type = SAA7134_INPUT_TV, 5680 .type = SAA7134_INPUT_TV,
5873 .vmux = 1, 5681 .vmux = 1,
5874 .amux = LINE2, 5682 .amux = LINE2,
5875 .tv = 1,
5876 }, { 5683 }, {
5877 .type = SAA7134_INPUT_COMPOSITE1, 5684 .type = SAA7134_INPUT_COMPOSITE1,
5878 .vmux = 0, 5685 .vmux = 0,
@@ -5904,7 +5711,6 @@ struct saa7134_board saa7134_boards[] = {
5904 .vmux = 1, 5711 .vmux = 1,
5905 .amux = LINE1, 5712 .amux = LINE1,
5906 .gpio = 0x00, 5713 .gpio = 0x00,
5907 .tv = 1,
5908 }, { 5714 }, {
5909 .type = SAA7134_INPUT_COMPOSITE1, 5715 .type = SAA7134_INPUT_COMPOSITE1,
5910 .vmux = 3, 5716 .vmux = 3,
diff --git a/drivers/media/pci/saa7134/saa7134-video.c b/drivers/media/pci/saa7134/saa7134-video.c
index 59781755247a..9debfb549887 100644
--- a/drivers/media/pci/saa7134/saa7134-video.c
+++ b/drivers/media/pci/saa7134/saa7134-video.c
@@ -1384,10 +1384,16 @@ int saa7134_enum_input(struct file *file, void *priv, struct v4l2_input *i)
1384 if (card_in(dev, i->index).type == SAA7134_NO_INPUT) 1384 if (card_in(dev, i->index).type == SAA7134_NO_INPUT)
1385 return -EINVAL; 1385 return -EINVAL;
1386 i->index = n; 1386 i->index = n;
1387 i->type = V4L2_INPUT_TYPE_CAMERA;
1388 strcpy(i->name, saa7134_input_name[card_in(dev, n).type]); 1387 strcpy(i->name, saa7134_input_name[card_in(dev, n).type]);
1389 if (card_in(dev, n).tv) 1388 switch (card_in(dev, n).type) {
1389 case SAA7134_INPUT_TV:
1390 case SAA7134_INPUT_TV_MONO:
1390 i->type = V4L2_INPUT_TYPE_TUNER; 1391 i->type = V4L2_INPUT_TYPE_TUNER;
1392 break;
1393 default:
1394 i->type = V4L2_INPUT_TYPE_CAMERA;
1395 break;
1396 }
1391 if (n == dev->ctl_input) { 1397 if (n == dev->ctl_input) {
1392 int v1 = saa_readb(SAA7134_STATUS_VIDEO1); 1398 int v1 = saa_readb(SAA7134_STATUS_VIDEO1);
1393 int v2 = saa_readb(SAA7134_STATUS_VIDEO2); 1399 int v2 = saa_readb(SAA7134_STATUS_VIDEO2);
@@ -1656,7 +1662,8 @@ int saa7134_g_tuner(struct file *file, void *priv,
1656 return -EINVAL; 1662 return -EINVAL;
1657 memset(t, 0, sizeof(*t)); 1663 memset(t, 0, sizeof(*t));
1658 for (n = 0; n < SAA7134_INPUT_MAX; n++) { 1664 for (n = 0; n < SAA7134_INPUT_MAX; n++) {
1659 if (card_in(dev, n).tv) 1665 if (card_in(dev, n).type == SAA7134_INPUT_TV ||
1666 card_in(dev, n).type == SAA7134_INPUT_TV_MONO)
1660 break; 1667 break;
1661 } 1668 }
1662 if (n == SAA7134_INPUT_MAX) 1669 if (n == SAA7134_INPUT_MAX)
diff --git a/drivers/media/pci/saa7134/saa7134.h b/drivers/media/pci/saa7134/saa7134.h
index 274a472e7d6b..e3e2392f87d6 100644
--- a/drivers/media/pci/saa7134/saa7134.h
+++ b/drivers/media/pci/saa7134/saa7134.h
@@ -384,7 +384,6 @@ struct saa7134_input {
384 unsigned int vmux; 384 unsigned int vmux;
385 enum saa7134_audio_in amux; 385 enum saa7134_audio_in amux;
386 unsigned int gpio; 386 unsigned int gpio;
387 unsigned int tv:1;
388}; 387};
389 388
390enum saa7134_mpeg_type { 389enum saa7134_mpeg_type {
generated by cgit v1.2.2 (git 2.25.0) at 2025-02-23 21:26:56 -0500