Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 8af7779f authored by Baruch Siach's avatar Baruch Siach Committed by Mauro Carvalho Chehab
Browse files

[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: default avatarBaruch Siach <baruch@tkos.co.il>
Reviewed-by: default avatarFabio Estevam <fabio.estevam@nxp.com>
Signed-off-by: default avatarMauro Carvalho Chehab <mchehab@s-opensource.com>
parent 44750606

drivers/media/platform/coda/coda-common.c

+4 −0
Original line number Diff line number Diff line
@@ -2221,6 +2221,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,
@@ -2234,6 +2235,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,
@@ -2248,6 +2250,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,
@@ -2262,6 +2265,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,

drivers/media/platform/coda/coda.h

+1 −1
Original line number Diff line number Diff line
@@ -50,7 +50,7 @@ enum coda_product { 
struct coda_video_device;



struct coda_devtype {

	char			*firmware[2];

	char			*firmware[3];

	enum coda_product	product;

	const struct coda_codec	*codecs;

	unsigned int		num_codecs;