diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-22 19:11:13 +0400 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@infradead.org> | 2008-07-20 14:12:05 +0400 |
| commit | f24648e42fd4b7d3ad5af6eaefe0214426933954 (patch) | |
| tree | b51249dc037f88ca25a0c22132bd370aa0b4ce69 /drivers/media/video/cx18 | |
| parent | 156f194b9df243b4c347a62b37258cb088f20297 (diff) | |
| download | linux-f24648e42fd4b7d3ad5af6eaefe0214426933954.tar.xz | |
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>
Diffstat (limited to 'drivers/media/video/cx18')
| -rw-r--r-- | drivers/media/video/cx18/cx18-cards.c | 1 | ||||
| -rw-r--r-- | drivers/media/video/cx18/cx18-firmware.c | 5 |
2 files changed, 6 insertions, 0 deletions
diff --git a/drivers/media/video/cx18/cx18-cards.c b/drivers/media/video/cx18/cx18-cards.c index e4295989829b..456fc924cf8c 100644 --- 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 2694ce350631..2c280728dd7e 100644 --- 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); |