Skip to content

Commit

Permalink
[media] cx18: Declare MODULE_FIRMWARE usage
Browse files Browse the repository at this point in the history 
Signed-off-by: Tim Gardner <tim.gardner@canonical.com>
Acked-by: Andy Walls <awalls@md.metrocast.net>
Signed-off-by: Mauro Carvalho Chehab <mchehab@redhat.com>
  • Loading branch information
Tim Gardner authored and Mauro Carvalho Chehab committed Jul 31, 2012
1 parent 740a3ea commit 8a7bf1d
Show file tree
Hide file tree
Showing 4 changed files with 16 additions and 3 deletions.
2 changes: 2 additions & 0 deletions drivers/media/video/cx18/cx18-av-firmware.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -221,3 +221,5 @@ int cx18_av_loadfw(struct cx18 *cx)
release_firmware(fw);
return 0;
}

MODULE_FIRMWARE(FWFILE);
1 change: 1 addition & 0 deletions drivers/media/video/cx18/cx18-driver.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void)

module_init(module_start);
module_exit(module_cleanup);
MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE);
6 changes: 5 additions & 1 deletion drivers/media/video/cx18/cx18-dvb.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,8 @@

DVB_DEFINE_MOD_OPT_ADAPTER_NR(adapter_nr);

#define FWFILE "dvb-cx18-mpc718-mt352.fw"

#define CX18_REG_DMUX_NUM_PORT_0_CONTROL 0xd5a000
#define CX18_CLOCK_ENABLE2 0xc71024
#define CX18_DMUX_CLK_MASK 0x0080
Expand Down Expand Up @@ -135,7 +137,7 @@ static int yuan_mpc718_mt352_reqfw(struct cx18_stream *stream,
const struct firmware **fw)
{
struct cx18 *cx = stream->cx;
const char *fn = "dvb-cx18-mpc718-mt352.fw";
const char *fn = FWFILE;
int ret;

ret = request_firmware(fw, fn, &cx->pci_dev->dev);
Expand Down Expand Up @@ -603,3 +605,5 @@ static int dvb_register(struct cx18_stream *stream)

return ret;
}

MODULE_FIRMWARE(FWFILE);
10 changes: 8 additions & 2 deletions drivers/media/video/cx18/cx18-firmware.c
View file
Original file line number Diff line number Diff line change
Expand Up @@ -376,6 +376,9 @@ void cx18_init_memory(struct cx18 *cx)
cx18_write_reg(cx, 0x00000101, CX18_WMB_CLIENT14); /* AVO */
}

#define CX18_CPU_FIRMWARE "v4l-cx23418-cpu.fw"
#define CX18_APU_FIRMWARE "v4l-cx23418-apu.fw"

int cx18_firmware_init(struct cx18 *cx)
{
u32 fw_entry_addr;
Expand All @@ -400,15 +403,15 @@ int cx18_firmware_init(struct cx18 *cx)
cx18_sw1_irq_enable(cx, IRQ_CPU_TO_EPU | IRQ_APU_TO_EPU);
cx18_sw2_irq_enable(cx, IRQ_CPU_TO_EPU_ACK | IRQ_APU_TO_EPU_ACK);

sz = load_cpu_fw_direct("v4l-cx23418-cpu.fw", cx->enc_mem, cx);
sz = load_cpu_fw_direct(CX18_CPU_FIRMWARE, cx->enc_mem, cx);
if (sz <= 0)
return sz;

/* The SCB & IPC area *must* be correct before starting the firmwares */
cx18_init_scb(cx);

fw_entry_addr = 0;
sz = load_apu_fw_direct("v4l-cx23418-apu.fw", cx->enc_mem, cx,
sz = load_apu_fw_direct(CX18_APU_FIRMWARE, cx->enc_mem, cx,
&fw_entry_addr);
if (sz <= 0)
return sz;
Expand Down Expand Up @@ -451,3 +454,6 @@ int cx18_firmware_init(struct cx18 *cx)
cx18_write_reg_expect(cx, 0x14001400, 0xc78110, 0x00001400, 0x14001400);
return 0;
}

MODULE_FIRMWARE(CX18_CPU_FIRMWARE);
MODULE_FIRMWARE(CX18_APU_FIRMWARE);

0 comments on commit 8a7bf1d

Please sign in to comment.