aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorIgor M. Liplianin <liplianin@me.by>2008-11-23 12:11:16 -0500
committerMauro Carvalho Chehab <mchehab@redhat.com>2008-12-30 06:38:25 -0500
commit9bb1b7e879091f09fc677dca10c5e132b68a9da3 (patch)
tree346dd4bacfb59f16f325a93efb5ef93da8d2e1eb
parentf89bc32974a4376e8393001484af28d8c3350ab4 (diff)
V4L/DVB (9795): Add Compro VideoMate E650F (DVB-T part only).
Add Compro VideoMate E650F (DVB-T part only). The card based on cx23885 PCI-Express chip, xc3028 tuner and ce6353 demodulator. Cc: Steven Toth <stoth@linuxtv.org> Signed-off-by: Igor M. Liplianin <liplianin@me.by> Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
-rw-r--r--Documentation/video4linux/CARDLIST.cx238851
-rw-r--r--drivers/media/video/cx23885/cx23885-cards.c12
-rw-r--r--drivers/media/video/cx23885/cx23885-dvb.c1
-rw-r--r--drivers/media/video/cx23885/cx23885.h1
4 files changed, 15 insertions, 0 deletions
diff --git a/Documentation/video4linux/CARDLIST.cx23885 b/Documentation/video4linux/CARDLIST.cx23885
index 64823ccacd69..35ea130e9898 100644
--- a/Documentation/video4linux/CARDLIST.cx23885
+++ b/Documentation/video4linux/CARDLIST.cx23885
@@ -11,3 +11,4 @@
11 10 -> DViCO FusionHDTV7 Dual Express [18ac:d618] 11 10 -> DViCO FusionHDTV7 Dual Express [18ac:d618]
12 11 -> DViCO FusionHDTV DVB-T Dual Express [18ac:db78] 12 11 -> DViCO FusionHDTV DVB-T Dual Express [18ac:db78]
13 12 -> Leadtek Winfast PxDVR3200 H [107d:6681] 13 12 -> Leadtek Winfast PxDVR3200 H [107d:6681]
14 13 -> Compro VideoMate E650F [185b:e800]
diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index dac5ccc9ba72..caa098beeecf 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -158,6 +158,10 @@ struct cx23885_board cx23885_boards[] = {
158 .name = "Leadtek Winfast PxDVR3200 H", 158 .name = "Leadtek Winfast PxDVR3200 H",
159 .portc = CX23885_MPEG_DVB, 159 .portc = CX23885_MPEG_DVB,
160 }, 160 },
161 [CX23885_BOARD_COMPRO_VIDEOMATE_E650F] = {
162 .name = "Compro VideoMate E650F",
163 .portc = CX23885_MPEG_DVB,
164 },
161}; 165};
162const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards); 166const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
163 167
@@ -237,6 +241,10 @@ struct cx23885_subid cx23885_subids[] = {
237 .subvendor = 0x107d, 241 .subvendor = 0x107d,
238 .subdevice = 0x6681, 242 .subdevice = 0x6681,
239 .card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H, 243 .card = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
244 }, {
245 .subvendor = 0x185b,
246 .subdevice = 0xe800,
247 .card = CX23885_BOARD_COMPRO_VIDEOMATE_E650F,
240 }, 248 },
241}; 249};
242const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids); 250const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -390,6 +398,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
390 case CX23885_BOARD_HAUPPAUGE_HVR1500: 398 case CX23885_BOARD_HAUPPAUGE_HVR1500:
391 case CX23885_BOARD_HAUPPAUGE_HVR1500Q: 399 case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
392 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: 400 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
401 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
393 /* Tuner Reset Command */ 402 /* Tuner Reset Command */
394 bitmask = 0x04; 403 bitmask = 0x04;
395 break; 404 break;
@@ -530,6 +539,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
530 cx_set(GP0_IO, 0x000f000f); 539 cx_set(GP0_IO, 0x000f000f);
531 break; 540 break;
532 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: 541 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
542 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
533 /* GPIO-2 xc3028 tuner reset */ 543 /* GPIO-2 xc3028 tuner reset */
534 544
535 /* The following GPIO's are on the internal AVCore (cx25840) */ 545 /* The following GPIO's are on the internal AVCore (cx25840) */
@@ -630,6 +640,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
630 case CX23885_BOARD_HAUPPAUGE_HVR1700: 640 case CX23885_BOARD_HAUPPAUGE_HVR1700:
631 case CX23885_BOARD_HAUPPAUGE_HVR1400: 641 case CX23885_BOARD_HAUPPAUGE_HVR1400:
632 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: 642 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
643 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
633 default: 644 default:
634 ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */ 645 ts2->gen_ctrl_val = 0xc; /* Serial bus + punctured clock */
635 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */ 646 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -644,6 +655,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
644 case CX23885_BOARD_HAUPPAUGE_HVR1800lp: 655 case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
645 case CX23885_BOARD_HAUPPAUGE_HVR1700: 656 case CX23885_BOARD_HAUPPAUGE_HVR1700:
646 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: 657 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
658 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
647 request_module("cx25840"); 659 request_module("cx25840");
648 break; 660 break;
649 } 661 }
diff --git a/drivers/media/video/cx23885/cx23885-dvb.c b/drivers/media/video/cx23885/cx23885-dvb.c
index e1aac07b3158..1c454128a9df 100644
--- a/drivers/media/video/cx23885/cx23885-dvb.c
+++ b/drivers/media/video/cx23885/cx23885-dvb.c
@@ -502,6 +502,7 @@ static int dvb_register(struct cx23885_tsport *port)
502 break; 502 break;
503 } 503 }
504 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H: 504 case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
505 case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
505 i2c_bus = &dev->i2c_bus[0]; 506 i2c_bus = &dev->i2c_bus[0];
506 507
507 fe0->dvb.frontend = dvb_attach(zl10353_attach, 508 fe0->dvb.frontend = dvb_attach(zl10353_attach,
diff --git a/drivers/media/video/cx23885/cx23885.h b/drivers/media/video/cx23885/cx23885.h
index 1d53f54cd943..67828029fc69 100644
--- a/drivers/media/video/cx23885/cx23885.h
+++ b/drivers/media/video/cx23885/cx23885.h
@@ -66,6 +66,7 @@
66#define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10 66#define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10
67#define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11 67#define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11
68#define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12 68#define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12
69#define CX23885_BOARD_COMPRO_VIDEOMATE_E650F 13
69 70
70/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */ 71/* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
71#define CX23885_NORMS (\ 72#define CX23885_NORMS (\