diff mbox

[v2,media] coda: add Freescale firmware compatibility location

Message ID 5723860e4668aebd07ea61d17b7879bea8b2f230.1484467154.git.baruch@tkos.co.il (mailing list archive)
State New, archived
Headers show

Commit Message

Baruch Siach Jan. 15, 2017, 7:59 a.m. UTC 
The Freescale provided imx-vpu looks for firmware files under /lib/firmware/vpu
by default. Make coda look there for firmware files to ease the update path.

Cc: Fabio Estevam <festevam@gmail.com>
Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
v2: add compatibility path; don't change existing path (Fabio)
---
 drivers/media/platform/coda/coda-common.c | 4 ++++
 1 file changed, 4 insertions(+)

Comments

kernel test robot Jan. 15, 2017, 10:20 a.m. UTC | #1 
Hi Baruch,

[auto build test WARNING on linuxtv-media/master]
[also build test WARNING on v4.10-rc3 next-20170113]
[if your patch is applied to the wrong git tree, please drop us a note to help improve the system]

url:    https://github.com/0day-ci/linux/commits/Baruch-Siach/coda-add-Freescale-firmware-compatibility-location/20170115-160508
base:   git://linuxtv.org/media_tree.git master
config: arm-imx_v6_v7_defconfig (attached as .config)
compiler: arm-linux-gnueabi-gcc (Debian 6.1.1-9) 6.1.1 20160705
reproduce:
        wget https://git.kernel.org/cgit/linux/kernel/git/wfg/lkp-tests.git/plain/sbin/make.cross -O ~/bin/make.cross
        chmod +x ~/bin/make.cross
        # save the attached .config to linux build tree
        make.cross ARCH=arm 

All warnings (new ones prefixed by >>):

>> drivers/media/platform/coda/coda-common.c:2083:4: warning: excess elements in array initializer
       "v4l-codadx6-imx27.bin"
       ^~~~~~~~~~~~~~~~~~~~~~~
   drivers/media/platform/coda/coda-common.c:2083:4: note: (near initialization for 'coda_devdata[0].firmware')
   drivers/media/platform/coda/coda-common.c:2097:4: warning: excess elements in array initializer
       "v4l-coda7541-imx53.bin"
       ^~~~~~~~~~~~~~~~~~~~~~~~
   drivers/media/platform/coda/coda-common.c:2097:4: note: (near initialization for 'coda_devdata[1].firmware')
   drivers/media/platform/coda/coda-common.c:2112:4: warning: excess elements in array initializer
       "v4l-coda960-imx6q.bin"
       ^~~~~~~~~~~~~~~~~~~~~~~
   drivers/media/platform/coda/coda-common.c:2112:4: note: (near initialization for 'coda_devdata[2].firmware')
   drivers/media/platform/coda/coda-common.c:2127:4: warning: excess elements in array initializer
       "v4l-coda960-imx6dl.bin"
       ^~~~~~~~~~~~~~~~~~~~~~~~
   drivers/media/platform/coda/coda-common.c:2127:4: note: (near initialization for 'coda_devdata[3].firmware')

vim +2083 drivers/media/platform/coda/coda-common.c

c5d28e29 drivers/media/platform/coda/coda-common.c Ulf Hansson   2014-09-22  2067  put_pm:
c5d28e29 drivers/media/platform/coda/coda-common.c Ulf Hansson   2014-09-22  2068  	pm_runtime_put_sync(&pdev->dev);
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2069  }
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2070  
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2071  enum coda_platform {
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2072  	CODA_IMX27,
df1e74cc drivers/media/platform/coda.c             Philipp Zabel 2012-07-02  2073  	CODA_IMX53,
89548441 drivers/media/platform/coda.c             Philipp Zabel 2014-07-11  2074  	CODA_IMX6Q,
89548441 drivers/media/platform/coda.c             Philipp Zabel 2014-07-11  2075  	CODA_IMX6DL,
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2076  };
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2077  
c06d8752 drivers/media/platform/coda.c             Emil Goode    2012-08-14  2078  static const struct coda_devtype coda_devdata[] = {
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2079  	[CODA_IMX27] = {
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19  2080  		.firmware     = {
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19  2081  			"vpu_fw_imx27_TO2.bin",
1ec415b1 drivers/media/platform/coda/coda-common.c Baruch Siach  2017-01-15  2082  			"vpu/vpu_fw_imx27_TO2.bin",
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19 @2083  			"v4l-codadx6-imx27.bin"
2ac7f08e drivers/media/platform/coda/coda-common.c Philipp Zabel 2016-02-19  2084  		},
186b250a drivers/media/video/coda.c                Javier Martin 2012-07-26  2085  		.product      = CODA_DX6,
b96904e5 drivers/media/platform/coda.c             Philipp Zabel 2013-05-23  2086  		.codecs       = codadx6_codecs,
b96904e5 drivers/media/platform/coda.c             Philipp Zabel 2013-05-23  2087  		.num_codecs   = ARRAY_SIZE(codadx6_codecs),
2c11d1bd drivers/media/platform/coda/coda-common.c Philipp Zabel 2014-10-02  2088  		.vdevs        = codadx6_video_devices,
2c11d1bd drivers/media/platform/coda/coda-common.c Philipp Zabel 2014-10-02  2089  		.num_vdevs    = ARRAY_SIZE(codadx6_video_devices),
e5b0d1c6 drivers/media/platform/coda.c             Philipp Zabel 2014-07-11  2090  		.workbuf_size = 288 * 1024 + FMO_SLICE_SAVE_BUF_SIZE * 8 * 1024,
401e972f drivers/media/platform/coda.c             Philipp Zabel 2014-07-11  2091  		.iram_size    = 0xb000,

:::::: The code at line 2083 was first introduced by commit
:::::: 2ac7f08e307509703259bc7352f4dc22bb30ad65 [media] coda: add support for firmware files named as distributed by NXP

:::::: TO: Philipp Zabel <p.zabel@pengutronix.de>
:::::: CC: Mauro Carvalho Chehab <mchehab@osg.samsung.com>

---
0-DAY kernel test infrastructure                Open Source Technology Center
https://lists.01.org/pipermail/kbuild-all                   Intel Corporation
diff mbox

Patch

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 9e6bdafa16f5..ce0d00f3f3ba 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2079,6 +2079,7 @@  static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX27] = {
 		.firmware     = {
 			"vpu_fw_imx27_TO2.bin",
+			"vpu/vpu_fw_imx27_TO2.bin",
 			"v4l-codadx6-imx27.bin"
 		},
 		.product      = CODA_DX6,
@@ -2092,6 +2093,7 @@  static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX53] = {
 		.firmware     = {
 			"vpu_fw_imx53.bin",
+			"vpu/vpu_fw_imx53.bin",
 			"v4l-coda7541-imx53.bin"
 		},
 		.product      = CODA_7541,
@@ -2106,6 +2108,7 @@  static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX6Q] = {
 		.firmware     = {
 			"vpu_fw_imx6q.bin",
+			"vpu/vpu_fw_imx6q.bin",
 			"v4l-coda960-imx6q.bin"
 		},
 		.product      = CODA_960,
@@ -2120,6 +2123,7 @@  static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX6DL] = {
 		.firmware     = {
 			"vpu_fw_imx6d.bin",
+			"vpu/vpu_fw_imx6d.bin",
 			"v4l-coda960-imx6dl.bin"
 		},
 		.product      = CODA_960,