3 files changed, 14 insertions, 0 deletions

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[] = {
                 .name           = "Leadtek Winfast PxDVR3200 H",
                 .portc          = CX23885_MPEG_DVB,
         },
+        [CX23885_BOARD_COMPRO_VIDEOMATE_E650F] = {
+                .name           = "Compro VideoMate E650F",
+                .portc          = CX23885_MPEG_DVB,
+        },
 };
 const unsigned int cx23885_bcount = ARRAY_SIZE(cx23885_boards);
 
@@ -237,6 +241,10 @@ struct cx23885_subid cx23885_subids[] = {
                 .subvendor = 0x107d,
                 .subdevice = 0x6681,
                 .card      = CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H,
+        }, {
+                .subvendor = 0x185b,
+                .subdevice = 0xe800,
+                .card      = CX23885_BOARD_COMPRO_VIDEOMATE_E650F,
         },
 };
 const unsigned int cx23885_idcount = ARRAY_SIZE(cx23885_subids);
@@ -390,6 +398,7 @@ int cx23885_tuner_callback(void *priv, int component, int command, int arg)
         case CX23885_BOARD_HAUPPAUGE_HVR1500:
         case CX23885_BOARD_HAUPPAUGE_HVR1500Q:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
                 /* Tuner Reset Command */
                 bitmask = 0x04;
                 break;
@@ -530,6 +539,7 @@ void cx23885_gpio_setup(struct cx23885_dev *dev)
                 cx_set(GP0_IO, 0x000f000f);
                 break;
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
                 /* GPIO-2  xc3028 tuner reset */
 
                 /* The following GPIO's are on the internal AVCore (cx25840) */
@@ -630,6 +640,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_HAUPPAUGE_HVR1400:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
         default:
                 ts2->gen_ctrl_val  = 0xc; /* Serial bus + punctured clock */
                 ts2->ts_clk_en_val = 0x1; /* Enable TS_CLK */
@@ -644,6 +655,7 @@ void cx23885_card_setup(struct cx23885_dev *dev)
         case CX23885_BOARD_HAUPPAUGE_HVR1800lp:
         case CX23885_BOARD_HAUPPAUGE_HVR1700:
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
                 request_module("cx25840");
                 break;
         }
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)
                 break;
         }
         case CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H:
+        case CX23885_BOARD_COMPRO_VIDEOMATE_E650F:
                 i2c_bus = &dev->i2c_bus[0];
 
                 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 @@
 #define CX23885_BOARD_DVICO_FUSIONHDTV_7_DUAL_EXP 10
 #define CX23885_BOARD_DVICO_FUSIONHDTV_DVB_T_DUAL_EXP 11
 #define CX23885_BOARD_LEADTEK_WINFAST_PXDVR3200_H 12
+#define CX23885_BOARD_COMPRO_VIDEOMATE_E650F   13
 
 /* Currently unsupported by the driver: PAL/H, NTSC/Kr, SECAM B/G/H/LC */
 #define CX23885_NORMS (\