diff options
| author | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-22 14:11:13 +0200 |
|---|---|---|
| committer | Hans Verkuil <hverkuil@xs4all.nl> | 2008-06-22 14:11:13 +0200 |
| commit | 4cee5ccd8ff1a64334599e8c317ab04289dfa1f2 (patch) | |
| tree | 658f393b039e220037aa3daff1e6ed3f627b3d56 | |
| parent | 4353b01a599dc27d0eb927c6ef71dd8a0cdb5786 (diff) | |
| download | mediapointer-dvb-s2-4cee5ccd8ff1a64334599e8c317ab04289dfa1f2.tar.gz mediapointer-dvb-s2-4cee5ccd8ff1a64334599e8c317ab04289dfa1f2.tar.bz2 | |
cx18: improve support for the Raptor board.
From: Hans Verkuil <hverkuil@xs4all.nl>
- add radio definition
- reset the audio firmware (required for this board, harmless for the
others)
Signed-off-by: Hans Verkuil <hverkuil@xs4all.nl>
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-cards.c | 1 | ||||
| -rw-r--r-- | linux/drivers/media/video/cx18/cx18-firmware.c | 4 |
2 files changed, 2 insertions, 3 deletions
diff --git a/linux/drivers/media/video/cx18/cx18-cards.c b/linux/drivers/media/video/cx18/cx18-cards.c index e42959898..456fc924c 100644 --- a/linux/drivers/media/video/cx18/cx18-cards.c +++ b/linux/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/linux/drivers/media/video/cx18/cx18-firmware.c b/linux/drivers/media/video/cx18/cx18-firmware.c index 5e37427ec..2c280728d 100644 --- a/linux/drivers/media/video/cx18/cx18-firmware.c +++ b/linux/drivers/media/video/cx18/cx18-firmware.c @@ -344,13 +344,11 @@ int cx18_firmware_init(struct cx18 *cx) if (read_reg(CX18_PROC_SOFT_RESET) & 8) { int sz = load_apu_fw_direct("v4l-cx23418-apu.fw", cx->enc_mem, cx, CX18_FW_APU_SIZE); -#if 0 - /* this might be needed after all, check later */ + 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); -#endif sz = sz <= 0 ? sz : load_cpu_fw_direct("v4l-cx23418-cpu.fw", cx->enc_mem, cx, CX18_FW_CPU_SIZE); |