diff options
| author | Baruch Siach <baruch@tkos.co.il> | 2017-01-15 08:33:53 -0200 |
|---|---|---|
| committer | Mauro Carvalho Chehab <mchehab@s-opensource.com> | 2017-02-03 14:23:37 -0200 |
| commit | 8af7779f3cbc1f6720d15f00abc797493710d1ab (patch) | |
| tree | 4d7f83904dd318d0e6cb85bb36b2d150c7e94bc1 | |
| parent | 44750606b9dd2a3a070c3c17d4e44b3a7b363cf7 (diff) | |
| download | linux-8af7779f3cbc1f6720d15f00abc797493710d1ab.tar.bz2 | |
[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>
| -rw-r--r-- | drivers/media/platform/coda/coda-common.c | 4 | ||||
| -rw-r--r-- | drivers/media/platform/coda/coda.h | 2 |
2 files changed, 5 insertions, 1 deletions
diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c index a918b294adef..eb6548f46cba 100644 --- a/drivers/media/platform/coda/coda-common.c +++ b/drivers/media/platform/coda/coda-common.c @@ -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, diff --git a/drivers/media/platform/coda/coda.h b/drivers/media/platform/coda/coda.h index 7ed79eb774e7..4b831c91ae4a 100644 --- a/drivers/media/platform/coda/coda.h +++ b/drivers/media/platform/coda/coda.h @@ -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; |