---

yaml --- r: 103861 b: refs/heads/master c: f24648e h: refs/heads/master i: 103859: 02db53d v: v3
git-mirror · Jul 20, 2008 · 3bde8e2 · 3bde8e2
1 parent 6e3c0f5
commit 3bde8e2
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 1 deletion.
diff --git a/[refs] b/[refs]
@@ -1,2 +1,2 @@
 ---
-refs/heads/master: 156f194b9df243b4c347a62b37258cb088f20297
+refs/heads/master: f24648e42fd4b7d3ad5af6eaefe0214426933954
diff --git a/trunk/drivers/media/video/cx18/cx18-cards.c b/trunk/drivers/media/video/cx18/cx18-cards.c
@@ -268,6 +268,7 @@ static const struct cx18_card cx18_card_cnxt_raptor_pal = {
 	.tuners = {
 		{ .std = V4L2_STD_PAL_SECAM, .tuner = TUNER_PHILIPS_FM1216ME_MK3 },
 	},
+	.radio_input = { CX18_CARD_INPUT_AUD_TUNER, CX18_AV_AUDIO_SERIAL, 0 },
 	.ddr = {
 		/* MT 46V16M16 memory */
 		.chip_config = 0x50306,

diff --git a/trunk/drivers/media/video/cx18/cx18-firmware.c b/trunk/drivers/media/video/cx18/cx18-firmware.c
@@ -345,6 +345,11 @@ int cx18_firmware_init(struct cx18 *cx)
 		int sz = load_apu_fw_direct("v4l-cx23418-apu.fw",
 			       cx->enc_mem, cx, CX18_FW_APU_SIZE);
 
+		write_enc(0xE51FF004, 0);
+		write_enc(0xa00000, 4);  /* todo: not hardcoded */
+		write_reg(0x00010000, CX18_PROC_SOFT_RESET); /* Start APU */
+		cx18_msleep_timeout(500, 0);
+
 		sz = sz <= 0 ? sz : load_cpu_fw_direct("v4l-cx23418-cpu.fw",
 					cx->enc_mem, cx, CX18_FW_CPU_SIZE);