Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 443fed9fa42bbeacdb8d336b8a5002a262cac15c

Authored by Devin Heitmueller
Committed by Mauro Carvalho Chehab
1 parent d1875d6559
Exists in master and in 7 other branches imx_3.0.35_4.1.0, imx_3.10.17_1.0.1_ga, imx_3.10.53_1.1.0_ga, imx_3.14.28_1.0.0_ga, smarc-imx_3.10.53_1.1.0_ga, smarc-imx_3.14.28_1.0.0_ga, smarc-l5.0.0_1.0.0-ga

V4L/DVB: em28xx: add em286x/tvp5150 reference design 

Add support for design which has an em2863/tvp5150 and uses the standard
empia USB ID.  In Sander's case, it was branded as an "Eminent model EM3705"

Thanks to Sander Van Ginkel for testing and help debugging the support.

[mchehab@redhat.com: move it to a vague card number slot (card=29)]
Signed-off-by: Devin Heitmueller <dheitmueller@kernellabs.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 3 changed files with 20 additions and 1 deletions Side-by-side Diff

Documentation/video4linux/CARDLIST.em28xx
Diff comments   View file @ 443fed9
1 1 0 -> Unknown EM2800 video grabber (em2800) [eb1a:2800]
2   - 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2862,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868]
  2 + 1 -> Unknown EM2750/28xx video grabber (em2820/em2840) [eb1a:2710,eb1a:2820,eb1a:2821,eb1a:2860,eb1a:2861,eb1a:2862,eb1a:2863,eb1a:2870,eb1a:2881,eb1a:2883,eb1a:2868]
3 3 2 -> Terratec Cinergy 250 USB (em2820/em2840) [0ccd:0036]
4 4 3 -> Pinnacle PCTV USB 2 (em2820/em2840) [2304:0208]
5 5 4 -> Hauppauge WinTV USB 2 (em2820/em2840) [2040:4200,2040:4201]
... ... @@ -27,6 +27,7 @@
27 27 26 -> Hercules Smart TV USB 2.0 (em2820/em2840)
28 28 27 -> Pinnacle PCTV USB 2 (Philips FM1216ME) (em2820/em2840)
29 29 28 -> Leadtek Winfast USB II Deluxe (em2820/em2840)
  30 + 29 -> EM2860/TVP5150 Reference Design (em2860)
30 31 30 -> Videology 20K14XUSB USB2.0 (em2820/em2840)
31 32 31 -> Usbgear VD204v9 (em2821)
32 33 32 -> Supercomp USB 2.0 TV (em2821)
drivers/media/video/em28xx/em28xx-cards.c
Diff comments   View file @ 443fed9
... ... @@ -681,6 +681,20 @@
681 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 698 [EM2861_BOARD_PLEXTOR_PX_TV100U] = {
685 699 .name = "Plextor ConvertX PX-TV100U",
686 700 .tuner_type = TUNER_TNF_5335MF,
... ... @@ -1676,6 +1690,8 @@
1676 1690 .driver_info = EM2820_BOARD_UNKNOWN },
1677 1691 { USB_DEVICE(0xeb1a, 0x2862),
1678 1692 .driver_info = EM2820_BOARD_UNKNOWN },
  1693 + { USB_DEVICE(0xeb1a, 0x2863),
  1694 + .driver_info = EM2820_BOARD_UNKNOWN },
1679 1695 { USB_DEVICE(0xeb1a, 0x2870),
1680 1696 .driver_info = EM2820_BOARD_UNKNOWN },
1681 1697 { USB_DEVICE(0xeb1a, 0x2881),
... ... @@ -1796,6 +1812,7 @@
1796 1812 {0xb06a32c3, EM2800_BOARD_TERRATEC_CINERGY_200, TUNER_LG_PAL_NEW_TAPC},
1797 1813 {0xf51200e3, EM2800_BOARD_VGEAR_POCKETTV, TUNER_LG_PAL_NEW_TAPC},
1798 1814 {0x1ba50080, EM2860_BOARD_SAA711X_REFERENCE_DESIGN, TUNER_ABSENT},
  1815 + {0x77800080, EM2860_BOARD_TVP5150_REFERENCE_DESIGN, TUNER_ABSENT},
1799 1816 {0xc51200e3, EM2820_BOARD_GADMEI_TVR200, TUNER_LG_PAL_NEW_TAPC},
1800 1817 {0x4ba50080, EM2861_BOARD_GADMEI_UTV330PLUS, TUNER_TNF_5335MF},
1801 1818 };
drivers/media/video/em28xx/em28xx.h
Diff comments   View file @ 443fed9
... ... @@ -68,6 +68,7 @@
68 68 #define EM2820_BOARD_HERCULES_SMART_TV_USB2 26
69 69 #define EM2820_BOARD_PINNACLE_USB_2_FM1216ME 27
70 70 #define EM2820_BOARD_LEADTEK_WINFAST_USBII_DELUXE 28
  71 +#define EM2860_BOARD_TVP5150_REFERENCE_DESIGN 29
71 72 #define EM2820_BOARD_VIDEOLOGY_20K14XUSB 30
72 73 #define EM2821_BOARD_USBGEAR_VD204 31
73 74 #define EM2821_BOARD_SUPERCOMP_USB_2 32