V4L/DVB (8107): cx18: improve support for the Raptor board.

- add radio definition
- reset the audio firmware (required for this board, harmless for the
others)

Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
Signed-off-by: Mauro Carvalho Chehab <mchehab@infradead.org>

diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c
index e4295989829b15be5b0f9cf6632d86aeaeecf5e9..456fc924cf8cf6b6da62bc44f61314ee5f530f15 100644 (file)
--- a/drivers/media/video/cx18/cx18-cards.c
+++ b/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/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c
index 2694ce35063140a61d1f598bb7462c1adfb55b60..2c280728dd7e11853a5a49fbb6b181f3d6869ceb 100644 (file)
--- a/drivers/media/video/cx18/cx18-firmware.c
+++ b/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);