From mboxrd@z Thu Jan 1 00:00:00 1970 Return-path: Received: from mail.tpi.com ([70.99.223.143]:1765 "EHLO mail.tpi.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1752367Ab2GZRVl (ORCPT ); Thu, 26 Jul 2012 13:21:41 -0400 Message-ID: <50117C91.8090207@canonical.com> Date: Thu, 26 Jul 2012 11:21:21 -0600 From: Tim Gardner MIME-Version: 1.0 To: linux-kernel@vger.kernel.org CC: Andy Walls , Mauro Carvalho Chehab , ivtv-devel@ivtvdriver.org, linux-media@vger.kernel.org Subject: Re: [PATCH v2] cx18: Declare MODULE_FIRMWARE usage References: <1343322358-128310-1-git-send-email-tim.gardner@canonical.com> In-Reply-To: <1343322358-128310-1-git-send-email-tim.gardner@canonical.com> Content-Type: multipart/mixed; boundary="------------020407030802040605000401" Sender: linux-media-owner@vger.kernel.org List-ID: This is a multi-part message in MIME format. --------------020407030802040605000401 Content-Type: text/plain; charset=ISO-8859-1; format=flowed Content-Transfer-Encoding: 7bit Missed a firmware file in cx18-av-firmware.c rtg -- Tim Gardner tim.gardner@canonical.com --------------020407030802040605000401 Content-Type: text/x-patch; name="0001-cx18-Declare-MODULE_FIRMWARE-usage.patch" Content-Transfer-Encoding: 7bit Content-Disposition: attachment; filename="0001-cx18-Declare-MODULE_FIRMWARE-usage.patch" >>From 9b4be013f173efc12bb2776394bf6a5abb8725b6 Mon Sep 17 00:00:00 2001 From: Tim Gardner Date: Thu, 26 Jul 2012 11:03:51 -0600 Subject: [PATCH v2] cx18: Declare MODULE_FIRMWARE usage Cc: Andy Walls Cc: Mauro Carvalho Chehab Cc: ivtv-devel@ivtvdriver.org Cc: linux-media@vger.kernel.org Signed-off-by: Tim Gardner --- 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 --------------020407030802040605000401--