* [PATCH] cx18: Declare MODULE_FIRMWARE usage @ 2012-07-26 17:05 Tim Gardner 2012-07-26 17:21 ` [PATCH v2] " Tim Gardner 2012-07-26 22:07 ` [PATCH] " Andy Walls 0 siblings, 2 replies; 6+ messages in thread From: Tim Gardner @ 2012-07-26 17:05 UTC (permalink / raw) To: linux-kernel Cc: Tim Gardner, Andy Walls, Mauro Carvalho Chehab, ivtv-devel, linux-media Cc: Andy Walls <awalls@md.metrocast.net> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: ivtv-devel@ivtvdriver.org Cc: linux-media@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/media/video/cx18/cx18-driver.c | 1 + drivers/media/video/cx18/cx18-firmware.c | 10 ++++++++-- 2 files changed, 9 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 7e5ffd6..c67733d 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void) module_init(module_start); module_exit(module_cleanup); +MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE); diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c index b85c292..a1c1cec 100644 --- a/drivers/media/video/cx18/cx18-firmware.c +++ b/drivers/media/video/cx18/cx18-firmware.c @@ -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; @@ -400,7 +403,7 @@ 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; @@ -408,7 +411,7 @@ int cx18_firmware_init(struct cx18 *cx) 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; @@ -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); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] cx18: Declare MODULE_FIRMWARE usage 2012-07-26 17:05 [PATCH] cx18: Declare MODULE_FIRMWARE usage Tim Gardner @ 2012-07-26 17:21 ` Tim Gardner 2012-07-26 22:12 ` Andy Walls 2012-07-26 22:07 ` [PATCH] " Andy Walls 1 sibling, 1 reply; 6+ messages in thread From: Tim Gardner @ 2012-07-26 17:21 UTC (permalink / raw) To: linux-kernel; +Cc: Andy Walls, Mauro Carvalho Chehab, ivtv-devel, linux-media [-- Attachment #1: Type: text/plain, Size: 92 bytes --] Missed a firmware file in cx18-av-firmware.c rtg -- Tim Gardner tim.gardner@canonical.com [-- Attachment #2: 0001-cx18-Declare-MODULE_FIRMWARE-usage.patch --] [-- Type: text/x-patch, Size: 2766 bytes --] >From 9b4be013f173efc12bb2776394bf6a5abb8725b6 Mon Sep 17 00:00:00 2001 From: Tim Gardner <tim.gardner@canonical.com> Date: Thu, 26 Jul 2012 11:03:51 -0600 Subject: [PATCH v2] cx18: Declare MODULE_FIRMWARE usage Cc: Andy Walls <awalls@md.metrocast.net> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: ivtv-devel@ivtvdriver.org Cc: linux-media@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/media/video/cx18/cx18-av-firmware.c | 2 ++ drivers/media/video/cx18/cx18-driver.c | 1 + drivers/media/video/cx18/cx18-firmware.c | 10 ++++++++-- 3 files changed, 11 insertions(+), 2 deletions(-) diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c index 280aa4d..a34fd08 100644 --- a/drivers/media/video/cx18/cx18-av-firmware.c +++ b/drivers/media/video/cx18/cx18-av-firmware.c @@ -221,3 +221,5 @@ int cx18_av_loadfw(struct cx18 *cx) release_firmware(fw); return 0; } + +MODULE_FIRMWARE(FWFILE); diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 7e5ffd6..c67733d 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void) module_init(module_start); module_exit(module_cleanup); +MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE); diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c index b85c292..a1c1cec 100644 --- a/drivers/media/video/cx18/cx18-firmware.c +++ b/drivers/media/video/cx18/cx18-firmware.c @@ -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; @@ -400,7 +403,7 @@ 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; @@ -408,7 +411,7 @@ int cx18_firmware_init(struct cx18 *cx) 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; @@ -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); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v2] cx18: Declare MODULE_FIRMWARE usage 2012-07-26 17:21 ` [PATCH v2] " Tim Gardner @ 2012-07-26 22:12 ` Andy Walls 0 siblings, 0 replies; 6+ messages in thread From: Andy Walls @ 2012-07-26 22:12 UTC (permalink / raw) To: Tim Gardner; +Cc: linux-kernel, Mauro Carvalho Chehab, ivtv-devel, linux-media On Thu, 2012-07-26 at 11:21 -0600, Tim Gardner wrote: > Missed a firmware file in cx18-av-firmware.c > > rtg Please send patches in-line vs. an attachment. This is still missing the firmware file in cx18-dvb.c. Regards, Andy > From 9b4be013f173efc12bb2776394bf6a5abb8725b6 Mon Sep 17 00:00:00 2001 > From: Tim Gardner <tim.gardner@canonical.com> > Date: Thu, 26 Jul 2012 11:03:51 -0600 > Subject: [PATCH v2] cx18: Declare MODULE_FIRMWARE usage > > Cc: Andy Walls <awalls@md.metrocast.net> > Cc: Mauro Carvalho Chehab <mchehab@infradead.org> > Cc: ivtv-devel@ivtvdriver.org > Cc: linux-media@vger.kernel.org > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > drivers/media/video/cx18/cx18-av-firmware.c | 2 ++ > drivers/media/video/cx18/cx18-driver.c | 1 + > drivers/media/video/cx18/cx18-firmware.c | 10 ++++++++-- > 3 files changed, 11 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/video/cx18/cx18-av-firmware.c > b/drivers/media/video/cx18/cx18-av-firmware.c > index 280aa4d..a34fd08 100644 > --- a/drivers/media/video/cx18/cx18-av-firmware.c > +++ b/drivers/media/video/cx18/cx18-av-firmware.c > @@ -221,3 +221,5 @@ int cx18_av_loadfw(struct cx18 *cx) > release_firmware(fw); > return 0; > } > + > +MODULE_FIRMWARE(FWFILE); > diff --git a/drivers/media/video/cx18/cx18-driver.c > b/drivers/media/video/cx18/cx18-driver.c > index 7e5ffd6..c67733d 100644 > --- a/drivers/media/video/cx18/cx18-driver.c > +++ b/drivers/media/video/cx18/cx18-driver.c > @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void) > > module_init(module_start); > module_exit(module_cleanup); > +MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE); > diff --git a/drivers/media/video/cx18/cx18-firmware.c > b/drivers/media/video/cx18/cx18-firmware.c > index b85c292..a1c1cec 100644 > --- a/drivers/media/video/cx18/cx18-firmware.c > +++ b/drivers/media/video/cx18/cx18-firmware.c > @@ -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; > @@ -400,7 +403,7 @@ 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; > > @@ -408,7 +411,7 @@ int cx18_firmware_init(struct cx18 *cx) > 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; > @@ -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); > -- > 1.7.9.5 > > ^ permalink raw reply [flat|nested] 6+ messages in thread
* Re: [PATCH] cx18: Declare MODULE_FIRMWARE usage 2012-07-26 17:05 [PATCH] cx18: Declare MODULE_FIRMWARE usage Tim Gardner 2012-07-26 17:21 ` [PATCH v2] " Tim Gardner @ 2012-07-26 22:07 ` Andy Walls 2012-07-27 16:45 ` [PATCH v3] " Tim Gardner 1 sibling, 1 reply; 6+ messages in thread From: Andy Walls @ 2012-07-26 22:07 UTC (permalink / raw) To: Tim Gardner; +Cc: linux-kernel, Mauro Carvalho Chehab, ivtv-devel, linux-media On Thu, 2012-07-26 at 11:05 -0600, Tim Gardner wrote: > Cc: Andy Walls <awalls@md.metrocast.net> > Cc: Mauro Carvalho Chehab <mchehab@infradead.org> > Cc: ivtv-devel@ivtvdriver.org > Cc: linux-media@vger.kernel.org > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> You missed v4l-cx23418-dig.fw, in cx18-av-firmware.c, which is required by all CX23418 devices. You missed dvb-cx18-mpc718-mt352.fw, in cx18-dvb.c, which is only needed by certain variants of the Yuan MPC-718 mini-PCI card. In cx18, the dvb-cx18-mpc718-mt352.fw need not exist for all common CX23418 based cards. I would not want anything in user space or the kernel to prevent module load, if this file does not exist. This firmware file is especially a pain, since it has to be snipped out of a Windows driver binary. Most users will not have it. Regards, Andy > --- > drivers/media/video/cx18/cx18-driver.c | 1 + > drivers/media/video/cx18/cx18-firmware.c | 10 ++++++++-- > 2 files changed, 9 insertions(+), 2 deletions(-) > > diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c > index 7e5ffd6..c67733d 100644 > --- a/drivers/media/video/cx18/cx18-driver.c > +++ b/drivers/media/video/cx18/cx18-driver.c > @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void) > > module_init(module_start); > module_exit(module_cleanup); > +MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE); > diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c > index b85c292..a1c1cec 100644 > --- a/drivers/media/video/cx18/cx18-firmware.c > +++ b/drivers/media/video/cx18/cx18-firmware.c > @@ -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; > @@ -400,7 +403,7 @@ 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; > > @@ -408,7 +411,7 @@ int cx18_firmware_init(struct cx18 *cx) > 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; > @@ -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); ^ permalink raw reply [flat|nested] 6+ messages in thread
* [PATCH v3] cx18: Declare MODULE_FIRMWARE usage 2012-07-26 22:07 ` [PATCH] " Andy Walls @ 2012-07-27 16:45 ` Tim Gardner 2012-07-28 16:53 ` Andy Walls 0 siblings, 1 reply; 6+ messages in thread From: Tim Gardner @ 2012-07-27 16:45 UTC (permalink / raw) To: linux-kernel Cc: Tim Gardner, Andy Walls, Mauro Carvalho Chehab, ivtv-devel, linux-media Cc: Andy Walls <awalls@md.metrocast.net> Cc: Mauro Carvalho Chehab <mchehab@infradead.org> Cc: ivtv-devel@ivtvdriver.org Cc: linux-media@vger.kernel.org Signed-off-by: Tim Gardner <tim.gardner@canonical.com> --- drivers/media/video/cx18/cx18-av-firmware.c | 2 ++ drivers/media/video/cx18/cx18-driver.c | 1 + drivers/media/video/cx18/cx18-dvb.c | 6 +++++- drivers/media/video/cx18/cx18-firmware.c | 10 ++++++++-- 4 files changed, 16 insertions(+), 3 deletions(-) diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c index 280aa4d..a34fd08 100644 --- a/drivers/media/video/cx18/cx18-av-firmware.c +++ b/drivers/media/video/cx18/cx18-av-firmware.c @@ -221,3 +221,5 @@ int cx18_av_loadfw(struct cx18 *cx) release_firmware(fw); return 0; } + +MODULE_FIRMWARE(FWFILE); diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c index 7e5ffd6..c67733d 100644 --- a/drivers/media/video/cx18/cx18-driver.c +++ b/drivers/media/video/cx18/cx18-driver.c @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void) module_init(module_start); module_exit(module_cleanup); +MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE); diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c index f41922b..3eac59c 100644 --- a/drivers/media/video/cx18/cx18-dvb.c +++ b/drivers/media/video/cx18/cx18-dvb.c @@ -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 @@ -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); @@ -603,3 +605,5 @@ static int dvb_register(struct cx18_stream *stream) return ret; } + +MODULE_FIRMWARE(FWFILE); diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c index b85c292..a1c1cec 100644 --- a/drivers/media/video/cx18/cx18-firmware.c +++ b/drivers/media/video/cx18/cx18-firmware.c @@ -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; @@ -400,7 +403,7 @@ 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; @@ -408,7 +411,7 @@ int cx18_firmware_init(struct cx18 *cx) 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; @@ -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); -- 1.7.9.5 ^ permalink raw reply related [flat|nested] 6+ messages in thread
* Re: [PATCH v3] cx18: Declare MODULE_FIRMWARE usage 2012-07-27 16:45 ` [PATCH v3] " Tim Gardner @ 2012-07-28 16:53 ` Andy Walls 0 siblings, 0 replies; 6+ messages in thread From: Andy Walls @ 2012-07-28 16:53 UTC (permalink / raw) To: Tim Gardner; +Cc: linux-kernel, Mauro Carvalho Chehab, ivtv-devel, linux-media On Fri, 2012-07-27 at 10:45 -0600, Tim Gardner wrote: > Cc: Andy Walls <awalls@md.metrocast.net> Acked-by: Andy Walls <awalls@md.metrocast.net> Regards, Andy > Cc: Mauro Carvalho Chehab <mchehab@infradead.org> > Cc: ivtv-devel@ivtvdriver.org > Cc: linux-media@vger.kernel.org > Signed-off-by: Tim Gardner <tim.gardner@canonical.com> > --- > drivers/media/video/cx18/cx18-av-firmware.c | 2 ++ > drivers/media/video/cx18/cx18-driver.c | 1 + > drivers/media/video/cx18/cx18-dvb.c | 6 +++++- > drivers/media/video/cx18/cx18-firmware.c | 10 ++++++++-- > 4 files changed, 16 insertions(+), 3 deletions(-) > > diff --git a/drivers/media/video/cx18/cx18-av-firmware.c b/drivers/media/video/cx18/cx18-av-firmware.c > index 280aa4d..a34fd08 100644 > --- a/drivers/media/video/cx18/cx18-av-firmware.c > +++ b/drivers/media/video/cx18/cx18-av-firmware.c > @@ -221,3 +221,5 @@ int cx18_av_loadfw(struct cx18 *cx) > release_firmware(fw); > return 0; > } > + > +MODULE_FIRMWARE(FWFILE); > diff --git a/drivers/media/video/cx18/cx18-driver.c b/drivers/media/video/cx18/cx18-driver.c > index 7e5ffd6..c67733d 100644 > --- a/drivers/media/video/cx18/cx18-driver.c > +++ b/drivers/media/video/cx18/cx18-driver.c > @@ -1357,3 +1357,4 @@ static void __exit module_cleanup(void) > > module_init(module_start); > module_exit(module_cleanup); > +MODULE_FIRMWARE(XC2028_DEFAULT_FIRMWARE); > diff --git a/drivers/media/video/cx18/cx18-dvb.c b/drivers/media/video/cx18/cx18-dvb.c > index f41922b..3eac59c 100644 > --- a/drivers/media/video/cx18/cx18-dvb.c > +++ b/drivers/media/video/cx18/cx18-dvb.c > @@ -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 > @@ -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); > @@ -603,3 +605,5 @@ static int dvb_register(struct cx18_stream *stream) > > return ret; > } > + > +MODULE_FIRMWARE(FWFILE); > diff --git a/drivers/media/video/cx18/cx18-firmware.c b/drivers/media/video/cx18/cx18-firmware.c > index b85c292..a1c1cec 100644 > --- a/drivers/media/video/cx18/cx18-firmware.c > +++ b/drivers/media/video/cx18/cx18-firmware.c > @@ -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; > @@ -400,7 +403,7 @@ 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; > > @@ -408,7 +411,7 @@ int cx18_firmware_init(struct cx18 *cx) > 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; > @@ -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); ^ permalink raw reply [flat|nested] 6+ messages in thread
end of thread, other threads:[~2012-07-28 16:54 UTC | newest] Thread overview: 6+ messages (download: mbox.gz follow: Atom feed -- links below jump to the message on this page -- 2012-07-26 17:05 [PATCH] cx18: Declare MODULE_FIRMWARE usage Tim Gardner 2012-07-26 17:21 ` [PATCH v2] " Tim Gardner 2012-07-26 22:12 ` Andy Walls 2012-07-26 22:07 ` [PATCH] " Andy Walls 2012-07-27 16:45 ` [PATCH v3] " Tim Gardner 2012-07-28 16:53 ` Andy Walls
This is a public inbox, see mirroring instructions for how to clone and mirror all data and code used for this inbox; as well as URLs for NNTP newsgroup(s).