aboutsummaryrefslogtreecommitdiffstats
path: root/drivers/media/video/em28xx/em28xx-cards.c
diff options
context:
space:
mode:
Diffstat (limited to 'drivers/media/video/em28xx/em28xx-cards.c')
-rw-r--r--drivers/media/video/em28xx/em28xx-cards.c17
1 files changed, 17 insertions, 0 deletions
diff --git a/drivers/media/video/em28xx/em28xx-cards.c b/drivers/media/video/em28xx/em28xx-cards.c
index 5ed834ee7569..7b0ca583de55 100644
--- a/drivers/media/video/em28xx/em28xx-cards.c
+++ b/drivers/media/video/em28xx/em28xx-cards.c
@@ -681,6 +681,20 @@ struct em28xx_board em28xx_boards[] = {
681 .amux = EM28XX_AMUX_LINE_IN, 681 .amux = EM28XX_AMUX_LINE_IN,
682 } }, 682 } },
683 }, 683 },
684 [EM2860_BOARD_TVP5150_REFERENCE_DESIGN] = {
685 .name = "EM2860/TVP5150 Reference Design",
686 .tuner_type = TUNER_ABSENT, /* Capture only device */
687 .decoder = EM28XX_TVP5150,
688 .input = { {
689 .type = EM28XX_VMUX_COMPOSITE1,
690 .vmux = TVP5150_COMPOSITE1,
691 .amux = EM28XX_AMUX_LINE_IN,
692 }, {
693 .type = EM28XX_VMUX_SVIDEO,
694 .vmux = TVP5150_SVIDEO,
695 .amux = EM28XX_AMUX_LINE_IN,
696 } },
697 },
684 [EM2861_BOARD_PLEXTOR_PX_TV100U] = { 698 [EM2861_BOARD_PLEXTOR_PX_TV100U] = {
685 .name = "Plextor ConvertX PX-TV100U", 699 .name = "Plextor ConvertX PX-TV100U",
686 .tuner_type = TUNER_TNF_5335MF, 700 .tuner_type = TUNER_TNF_5335MF,
@@ -1676,6 +1690,8 @@ struct usb_device_id em28xx_id_table[] = {
1676 .driver_info = EM2820_BOARD_UNKNOWN }, 1690 .driver_info = EM2820_BOARD_UNKNOWN },
1677 { USB_DEVICE(0xeb1a, 0x2862), 1691 { USB_DEVICE(0xeb1a, 0x2862),
1678 .driver_info = EM2820_BOARD_UNKNOWN }, 1692 .driver_info = EM2820_BOARD_UNKNOWN },
1693 { USB_DEVICE(0xeb1a, 0x2863),
1694 .driver_info = EM2820_BOARD_UNKNOWN },
1679 { USB_DEVICE(0xeb1a, 0x2870), 1695 { USB_DEVICE(0xeb1a, 0x2870),
1680 .driver_info = EM2820_BOARD_UNKNOWN }, 1696 .driver_info = EM2820_BOARD_UNKNOWN },
1681 { USB_DEVICE(0xeb1a, 0x2881), 1697 { USB_DEVICE(0xeb1a, 0x2881),
@@ -1796,6 +1812,7 @@ static struct em28xx_hash_table em28xx_i2c_hash[] = {
1796 {0xb06a32c3, EM2800_BOARD_TERRATEC_CINERGY_200, TUNER_LG_PAL_NEW_TAPC}, 1812 {0xb06a32c3, EM2800_BOARD_TERRATEC_CINERGY_200, TUNER_LG_PAL_NEW_TAPC},
1797 {0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC}, 1813 {0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC},
1798 {0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT}, 1814 {0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT},
1815 {0x77800080, EM2860_BOARD_TVP5150_REFERENCE_DESIGN, TUNER_ABSENT},
1799 {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC}, 1816 {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
1800 {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF}, 1817 {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
1801}; 1818};