diff --git a/drivers/media/video/cx23885/cx23885-cards.c b/drivers/media/video/cx23885/cx23885-cards.c
index c3cf089..2524834 100644
--- a/drivers/media/video/cx23885/cx23885-cards.c
+++ b/drivers/media/video/cx23885/cx23885-cards.c
@@ -237,7 +237,29 @@ struct cx23885_board cx23885_boards[] = {
 	},
 	[CX23885_BOARD_COMPRO_VIDEOMATE_E650F] = {
 		.name		= "Compro VideoMate E650F",
+		.porta		= CX23885_ANALOG_VIDEO,
 		.portc		= CX23885_MPEG_DVB,
+		.tuner_type	= TUNER_XC2028,
+		.tuner_addr	= 0x61,
+		.input		= {
+			{
+				.type   = CX23885_VMUX_TELEVISION,
+				.vmux   = CX25840_COMPOSITE2
+			}, {
+				.type   = CX23885_VMUX_COMPOSITE1,
+				.vmux   = CX25840_COMPOSITE1
+			}, {
+				.type   = CX23885_VMUX_SVIDEO,
+				.vmux   = CX25840_SVIDEO_LUMA4|
+					CX25840_SVIDEO_CHROMA7
+			}, {
+				.type   = CX23885_VMUX_COMPONENT,
+				.vmux   = CX25840_COMPONENT_ON|
+					CX25840_VIN3_CH1 |
+					CX25840_VIN6_CH2 |
+					CX25840_VIN8_CH3
+			},
+		},
 	},
 	[CX23885_BOARD_TBS_6920] = {
 		.name		= "TurboSight TBS 6920",
diff --git a/drivers/media/video/cx25840/cx25840-core.c b/drivers/media/video/cx25840/cx25840-core.c
index cd99764..19b5634 100644
--- a/drivers/media/video/cx25840/cx25840-core.c
+++ b/drivers/media/video/cx25840/cx25840-core.c
@@ -581,7 +581,7 @@ static void cx23885_initialize(struct i2c_client *client)
 	};
 
 	/* ADC2 input select */
-	cx25840_write(client, 0x102, 0x10);
+	cx25840_write(client, 0x102, 0x00);
 
 	/* VIN1 & VIN5 */
 	cx25840_write(client, 0x103, 0x11);
