diff options
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r-- | drivers/media/video/em28xx/em28xx-cards.c | 22 |
1 files changed, 18 insertions, 4 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c index 2a4c99090601..be78485c1664 100644 --- a/drivers/media/video/em28xx/em28xx-cards.c +++ b/drivers/media/video/em28xx/em28xx-cards.c | |||
@@ -119,6 +119,7 @@ struct em28xx_board em28xx_boards[] = { | |||
119 | [EM2750_BOARD_UNKNOWN] = { | 119 | [EM2750_BOARD_UNKNOWN] = { |
120 | .name = "Unknown EM2750/EM2751 webcam grabber", | 120 | .name = "Unknown EM2750/EM2751 webcam grabber", |
121 | .xclk = EM28XX_XCLK_FREQUENCY_48MHZ, | 121 | .xclk = EM28XX_XCLK_FREQUENCY_48MHZ, |
122 | .tuner_type = TUNER_ABSENT, /* This is a webcam */ | ||
122 | .input = { { | 123 | .input = { { |
123 | .type = EM28XX_VMUX_COMPOSITE1, | 124 | .type = EM28XX_VMUX_COMPOSITE1, |
124 | .vmux = 0, | 125 | .vmux = 0, |
@@ -130,6 +131,7 @@ struct em28xx_board em28xx_boards[] = { | |||
130 | .is_em2800 = 1, | 131 | .is_em2800 = 1, |
131 | .tda9887_conf = TDA9887_PRESENT, | 132 | .tda9887_conf = TDA9887_PRESENT, |
132 | .decoder = EM28XX_SAA711X, | 133 | .decoder = EM28XX_SAA711X, |
134 | .tuner_type = TUNER_ABSENT, | ||
133 | .input = { { | 135 | .input = { { |
134 | .type = EM28XX_VMUX_COMPOSITE1, | 136 | .type = EM28XX_VMUX_COMPOSITE1, |
135 | .vmux = SAA7115_COMPOSITE0, | 137 | .vmux = SAA7115_COMPOSITE0, |
@@ -149,6 +151,7 @@ struct em28xx_board em28xx_boards[] = { | |||
149 | .name = "Huaqi DLCW-130", | 151 | .name = "Huaqi DLCW-130", |
150 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 152 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
151 | .xclk = EM28XX_XCLK_FREQUENCY_48MHZ, | 153 | .xclk = EM28XX_XCLK_FREQUENCY_48MHZ, |
154 | .tuner_type = TUNER_ABSENT, /* This is a webcam */ | ||
152 | .input = { { | 155 | .input = { { |
153 | .type = EM28XX_VMUX_COMPOSITE1, | 156 | .type = EM28XX_VMUX_COMPOSITE1, |
154 | .vmux = 0, | 157 | .vmux = 0, |
@@ -329,8 +332,8 @@ struct em28xx_board em28xx_boards[] = { | |||
329 | }, | 332 | }, |
330 | [EM2820_BOARD_PINNACLE_DVC_100] = { | 333 | [EM2820_BOARD_PINNACLE_DVC_100] = { |
331 | .name = "Pinnacle Dazzle DVC 100", | 334 | .name = "Pinnacle Dazzle DVC 100", |
332 | .valid = EM28XX_BOARD_NOT_VALIDATED, | ||
333 | .decoder = EM28XX_SAA711X, | 335 | .decoder = EM28XX_SAA711X, |
336 | .tuner_type = TUNER_ABSENT, /* Capture only device */ | ||
334 | .input = { { | 337 | .input = { { |
335 | .type = EM28XX_VMUX_COMPOSITE1, | 338 | .type = EM28XX_VMUX_COMPOSITE1, |
336 | .vmux = SAA7115_COMPOSITE0, | 339 | .vmux = SAA7115_COMPOSITE0, |
@@ -344,6 +347,7 @@ struct em28xx_board em28xx_boards[] = { | |||
344 | [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = { | 347 | [EM2820_BOARD_VIDEOLOGY_20K14XUSB] = { |
345 | .name = "Videology 20K14XUSB USB2.0", | 348 | .name = "Videology 20K14XUSB USB2.0", |
346 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 349 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
350 | .tuner_type = TUNER_ABSENT, /* This is a webcam */ | ||
347 | .input = { { | 351 | .input = { { |
348 | .type = EM28XX_VMUX_COMPOSITE1, | 352 | .type = EM28XX_VMUX_COMPOSITE1, |
349 | .vmux = 0, | 353 | .vmux = 0, |
@@ -395,6 +399,7 @@ struct em28xx_board em28xx_boards[] = { | |||
395 | [EM2821_BOARD_USBGEAR_VD204] = { | 399 | [EM2821_BOARD_USBGEAR_VD204] = { |
396 | .name = "Usbgear VD204v9", | 400 | .name = "Usbgear VD204v9", |
397 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 401 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
402 | .tuner_type = TUNER_ABSENT, /* Capture only device */ | ||
398 | .decoder = EM28XX_SAA711X, | 403 | .decoder = EM28XX_SAA711X, |
399 | .input = { { | 404 | .input = { { |
400 | .type = EM28XX_VMUX_COMPOSITE1, | 405 | .type = EM28XX_VMUX_COMPOSITE1, |
@@ -410,6 +415,7 @@ struct em28xx_board em28xx_boards[] = { | |||
410 | /* Beijing Huaqi Information Digital Technology Co., Ltd */ | 415 | /* Beijing Huaqi Information Digital Technology Co., Ltd */ |
411 | .name = "NetGMBH Cam", | 416 | .name = "NetGMBH Cam", |
412 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 417 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
418 | .tuner_type = TUNER_ABSENT, /* This is a webcam */ | ||
413 | .input = { { | 419 | .input = { { |
414 | .type = EM28XX_VMUX_COMPOSITE1, | 420 | .type = EM28XX_VMUX_COMPOSITE1, |
415 | .vmux = 0, | 421 | .vmux = 0, |
@@ -418,8 +424,8 @@ struct em28xx_board em28xx_boards[] = { | |||
418 | }, | 424 | }, |
419 | [EM2860_BOARD_TYPHOON_DVD_MAKER] = { | 425 | [EM2860_BOARD_TYPHOON_DVD_MAKER] = { |
420 | .name = "Typhoon DVD Maker", | 426 | .name = "Typhoon DVD Maker", |
421 | .valid = EM28XX_BOARD_NOT_VALIDATED, | ||
422 | .decoder = EM28XX_SAA711X, | 427 | .decoder = EM28XX_SAA711X, |
428 | .tuner_type = TUNER_ABSENT, /* Capture only device */ | ||
423 | .input = { { | 429 | .input = { { |
424 | .type = EM28XX_VMUX_COMPOSITE1, | 430 | .type = EM28XX_VMUX_COMPOSITE1, |
425 | .vmux = SAA7115_COMPOSITE0, | 431 | .vmux = SAA7115_COMPOSITE0, |
@@ -493,7 +499,7 @@ struct em28xx_board em28xx_boards[] = { | |||
493 | }, | 499 | }, |
494 | [EM2861_BOARD_YAKUMO_MOVIE_MIXER] = { | 500 | [EM2861_BOARD_YAKUMO_MOVIE_MIXER] = { |
495 | .name = "Yakumo MovieMixer", | 501 | .name = "Yakumo MovieMixer", |
496 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 502 | .tuner_type = TUNER_ABSENT, /* Capture only device */ |
497 | .decoder = EM28XX_TVP5150, | 503 | .decoder = EM28XX_TVP5150, |
498 | .input = { { | 504 | .input = { { |
499 | .type = EM28XX_VMUX_TELEVISION, | 505 | .type = EM28XX_VMUX_TELEVISION, |
@@ -529,6 +535,9 @@ struct em28xx_board em28xx_boards[] = { | |||
529 | .amux = EM28XX_AMUX_LINE_IN, | 535 | .amux = EM28XX_AMUX_LINE_IN, |
530 | } }, | 536 | } }, |
531 | }, | 537 | }, |
538 | |||
539 | /* Those boards with em2870 are DVB Only*/ | ||
540 | |||
532 | [EM2870_BOARD_TERRATEC_XS] = { | 541 | [EM2870_BOARD_TERRATEC_XS] = { |
533 | .name = "Terratec Cinergy T XS", | 542 | .name = "Terratec Cinergy T XS", |
534 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 543 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
@@ -561,6 +570,7 @@ struct em28xx_board em28xx_boards[] = { | |||
561 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 570 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
562 | .tuner_type = TUNER_ABSENT, /* MT2060 */ | 571 | .tuner_type = TUNER_ABSENT, /* MT2060 */ |
563 | }, | 572 | }, |
573 | |||
564 | [EM2880_BOARD_TERRATEC_HYBRID_XS_FR] = { | 574 | [EM2880_BOARD_TERRATEC_HYBRID_XS_FR] = { |
565 | .name = "Terratec Hybrid XS Secam", | 575 | .name = "Terratec Hybrid XS Secam", |
566 | .valid = EM28XX_BOARD_NOT_VALIDATED, | 576 | .valid = EM28XX_BOARD_NOT_VALIDATED, |
@@ -800,6 +810,7 @@ struct em28xx_board em28xx_boards[] = { | |||
800 | .name = "eMPIA Technology, Inc. GrabBeeX+ Video Encoder", | 810 | .name = "eMPIA Technology, Inc. GrabBeeX+ Video Encoder", |
801 | .is_em2800 = 1, | 811 | .is_em2800 = 1, |
802 | .decoder = EM28XX_SAA711X, | 812 | .decoder = EM28XX_SAA711X, |
813 | .tuner_type = TUNER_ABSENT, /* capture only board */ | ||
803 | .input = { { | 814 | .input = { { |
804 | .type = EM28XX_VMUX_COMPOSITE1, | 815 | .type = EM28XX_VMUX_COMPOSITE1, |
805 | .vmux = SAA7115_COMPOSITE0, | 816 | .vmux = SAA7115_COMPOSITE0, |
@@ -852,7 +863,7 @@ struct em28xx_board em28xx_boards[] = { | |||
852 | }, | 863 | }, |
853 | [EM2820_BOARD_PINNACLE_DVC_90] = { | 864 | [EM2820_BOARD_PINNACLE_DVC_90] = { |
854 | .name = "Pinnacle Dazzle DVC 90/DVC 100", | 865 | .name = "Pinnacle Dazzle DVC 90/DVC 100", |
855 | .tuner_type = TUNER_ABSENT, | 866 | .tuner_type = TUNER_ABSENT, /* capture only board */ |
856 | .decoder = EM28XX_SAA711X, | 867 | .decoder = EM28XX_SAA711X, |
857 | .input = { { | 868 | .input = { { |
858 | .type = EM28XX_VMUX_COMPOSITE1, | 869 | .type = EM28XX_VMUX_COMPOSITE1, |
@@ -1149,6 +1160,9 @@ struct em28xx_board em28xx_boards[] = { | |||
1149 | .amux = EM28XX_AMUX_LINE_IN, | 1160 | .amux = EM28XX_AMUX_LINE_IN, |
1150 | } }, | 1161 | } }, |
1151 | }, | 1162 | }, |
1163 | |||
1164 | /* em2874 tuners are DVB only */ | ||
1165 | |||
1152 | [EM2874_BOARD_PINNACLE_PCTV_80E] = { | 1166 | [EM2874_BOARD_PINNACLE_PCTV_80E] = { |
1153 | .name = "Pinnacle PCTV HD Mini", | 1167 | .name = "Pinnacle PCTV HD Mini", |
1154 | .tuner_type = TUNER_ABSENT, | 1168 | .tuner_type = TUNER_ABSENT, |