浏览代码

[media] coda: add Freescale firmware compatibility location

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>
Reviewed-by: Fabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: Mauro Carvalho Chehab <mchehab@s-opensource.com>
Baruch Siach 8 年之前
父节点
当前提交
8af7779f3c
共有 2 个文件被更改,包括 5 次插入1 次删除
  1. 4 0
      drivers/media/platform/coda/coda-common.c
  2. 1 1
      drivers/media/platform/coda/coda.h

+ 4 - 0
drivers/media/platform/coda/coda-common.c

@@ -2221,6 +2221,7 @@ static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX27] = {
 	[CODA_IMX27] = {
 		.firmware     = {
 		.firmware     = {
 			"vpu_fw_imx27_TO2.bin",
 			"vpu_fw_imx27_TO2.bin",
+			"vpu/vpu_fw_imx27_TO2.bin",
 			"v4l-codadx6-imx27.bin"
 			"v4l-codadx6-imx27.bin"
 		},
 		},
 		.product      = CODA_DX6,
 		.product      = CODA_DX6,
@@ -2234,6 +2235,7 @@ static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX53] = {
 	[CODA_IMX53] = {
 		.firmware     = {
 		.firmware     = {
 			"vpu_fw_imx53.bin",
 			"vpu_fw_imx53.bin",
+			"vpu/vpu_fw_imx53.bin",
 			"v4l-coda7541-imx53.bin"
 			"v4l-coda7541-imx53.bin"
 		},
 		},
 		.product      = CODA_7541,
 		.product      = CODA_7541,
@@ -2248,6 +2250,7 @@ static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX6Q] = {
 	[CODA_IMX6Q] = {
 		.firmware     = {
 		.firmware     = {
 			"vpu_fw_imx6q.bin",
 			"vpu_fw_imx6q.bin",
+			"vpu/vpu_fw_imx6q.bin",
 			"v4l-coda960-imx6q.bin"
 			"v4l-coda960-imx6q.bin"
 		},
 		},
 		.product      = CODA_960,
 		.product      = CODA_960,
@@ -2262,6 +2265,7 @@ static const struct coda_devtype coda_devdata[] = {
 	[CODA_IMX6DL] = {
 	[CODA_IMX6DL] = {
 		.firmware     = {
 		.firmware     = {
 			"vpu_fw_imx6d.bin",
 			"vpu_fw_imx6d.bin",
+			"vpu/vpu_fw_imx6d.bin",
 			"v4l-coda960-imx6dl.bin"
 			"v4l-coda960-imx6dl.bin"
 		},
 		},
 		.product      = CODA_960,
 		.product      = CODA_960,

+ 1 - 1
drivers/media/platform/coda/coda.h

@@ -50,7 +50,7 @@ enum coda_product {
 struct coda_video_device;
 struct coda_video_device;
 
 
 struct coda_devtype {
 struct coda_devtype {
-	char			*firmware[2];
+	char			*firmware[3];
 	enum coda_product	product;
 	enum coda_product	product;
 	const struct coda_codec	*codecs;
 	const struct coda_codec	*codecs;
 	unsigned int		num_codecs;
 	unsigned int		num_codecs;