Doug / smarc-fsl-linux-kernel

Download as
Browse Code ยป

Commit 34e383dd13edf402e87bf0a87f4a19b193b4bd7a

Authored by Vladimir Geroy
Committed by Mauro Carvalho Chehab
1 parent 7a254f468f
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 (13014): Add support for Compro VideoMate E800 (DVB-T part only) 

Adding Compro VideoMate E800 (DVB-T part only)

Cc: Steven Toth <stoth@linuxtv.org>
Signed-off-by: Vladimir Geroy <geroin22@yandex.ru>
Signed-off-by: Douglas Schilling Landgraf <dougsland@redhat.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>

Showing 4 changed files with 15 additions and 0 deletions Side-by-side Diff

Documentation/video4linux/CARDLIST.cx23885
Diff comments   View file @ 34e383d
... ... @@ -23,4 +23,5 @@
23 23 22 -> Mygica X8506 DMB-TH [14f1:8651]
24 24 23 -> Magic-Pro ProHDTV Extreme 2 [14f1:8657]
25 25 24 -> Hauppauge WinTV-HVR1850 [0070:8541]
  26 + 25 -> Compro VideoMate E800 [1858:e800]
drivers/media/video/cx23885/cx23885-cards.c
Diff comments   View file @ 34e383d
... ... @@ -210,6 +210,10 @@
210 210 .portb = CX23885_MPEG_ENCODER,
211 211 .portc = CX23885_MPEG_DVB,
212 212 },
  213 + [CX23885_BOARD_COMPRO_VIDEOMATE_E800] = {
  214 + .name = "Compro VideoMate E800",
  215 + .portc = CX23885_MPEG_DVB,
  216 + },
213 217 };
214 218 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
215 219  
... ... @@ -341,6 +345,10 @@
341 345 .subvendor = 0x0070,
342 346 .subdevice = 0x8541,
343 347 .card = CX23885_BOARD_HAUPPAUGE_HVR1850,
  348 + }, {
  349 + .subvendor = 0x1858,
  350 + .subdevice = 0xe800,
  351 + .card = CX23885_BOARD_COMPRO_VIDEOMATE_E800,
344 352 },
345 353 };
346 354 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
... ... @@ -536,6 +544,7 @@
536 544 case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
537 545 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
538 546 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
  547 + case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
539 548 /* Tuner Reset Command */
540 549 bitmask = 0x04;
541 550 break;
... ... @@ -687,6 +696,7 @@
687 696 break;
688 697 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
689 698 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
  699 + case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
690 700 /* GPIO-2 xc3028 tuner reset */
691 701  
692 702 /* The following GPIO's are on the internal AVCore (cx25840) */
... ... @@ -911,6 +921,7 @@
911 921 case CX23885_BOARD_HAUPPAUGE_HVR1255:
912 922 case CX23885_BOARD_HAUPPAUGE_HVR1210:
913 923 case CX23885_BOARD_HAUPPAUGE_HVR1850:
  924 + case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
914 925 default:
915 926 ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */
916 927 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
... ... @@ -927,6 +938,7 @@
927 938 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
928 939 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
929 940 case CX23885_BOARD_NETUP_DUAL_DVBS2_CI:
  941 + case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
930 942 dev->sd_cx25840 = v4l2_i2c_new_subdev(&dev->v4l2_dev,
931 943 &dev->i2c_bus[2].i2c_adap,
932 944 "cx25840", "cx25840", 0x88 >> 1, NULL);
drivers/media/video/cx23885/cx23885-dvb.c
Diff comments   View file @ 34e383d
... ... @@ -747,6 +747,7 @@
747 747 }
748 748 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
749 749 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
  750 + case CX23885_BOARD_COMPRO_VIDEOMATE_E800:
750 751 i2c_bus = &dev->i2c_bus[0];
751 752  
752 753 fe0->dvb.frontend = dvb_attach(zl10353_attach,
drivers/media/video/cx23885/cx23885.h
Diff comments   View file @ 34e383d
... ... @@ -78,6 +78,7 @@
78 78 #define CX23885_BOARD_MYGICA_X8506 22
79 79 #define CX23885_BOARD_MAGICPRO_PROHDTVE2 23
80 80 #define CX23885_BOARD_HAUPPAUGE_HVR1850 24
  81 +#define CX23885_BOARD_COMPRO_VIDEOMATE_E800 25
81 82  
82 83 #define GPIO_0 0x00000001
83 84 #define GPIO_1 0x00000002