[PATCH] [media] coda: fix Freescale firmware location

[PATCH] [media] coda: fix Freescale firmware location

[Baruch Siach]

The Freescale provided imx-vpu looks for firmware files under /lib/firmware/vpu
by default. Make coda conform with that to ease the update path.

Signed-off-by: Baruch Siach <baruch@tkos.co.il>
---
 drivers/media/platform/coda/coda-common.c | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
index 9e6bdafa16f5..140c02715855 100644
--- a/drivers/media/platform/coda/coda-common.c
+++ b/drivers/media/platform/coda/coda-common.c
@@ -2078,7 +2078,7 @@ enum coda_platform {
 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,
@@ -2091,7 +2091,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,
@@ -2105,7 +2105,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,
@@ -2119,7 +2119,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,
-- 
2.11.0

Re: [PATCH] [media] coda: fix Freescale firmware location

[Fabio Estevam]

Hi Baruch,

2016-12-27 8:06 GMT-02:00 Baruch Siach <baruch@tkos.co.il>:
> The Freescale provided imx-vpu looks for firmware files under /lib/firmware/vpu
> by default. Make coda conform with that to ease the update path.
>
> Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> ---
>  drivers/media/platform/coda/coda-common.c | 8 ++++----
>  1 file changed, 4 insertions(+), 4 deletions(-)
>
> diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
> index 9e6bdafa16f5..140c02715855 100644
> --- a/drivers/media/platform/coda/coda-common.c
> +++ b/drivers/media/platform/coda/coda-common.c
> @@ -2078,7 +2078,7 @@ enum coda_platform {
>  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"
>                 },

What about just adding the new path without removing the original one?
This way we avoid breakage for the users that use
"vpu_fw_imx27_TO2.bin" path.

Re: [PATCH] [media] coda: fix Freescale firmware location

[Baruch Siach]

Hi Fabio,

On Tue, Dec 27, 2016 at 09:26:16AM -0200, Fabio Estevam wrote:
> 2016-12-27 8:06 GMT-02:00 Baruch Siach <baruch@tkos.co.il>:
> > The Freescale provided imx-vpu looks for firmware files under /lib/firmware/vpu
> > by default. Make coda conform with that to ease the update path.
> >
> > Signed-off-by: Baruch Siach <baruch@tkos.co.il>
> > ---
> >  drivers/media/platform/coda/coda-common.c | 8 ++++----
> >  1 file changed, 4 insertions(+), 4 deletions(-)
> >
> > diff --git a/drivers/media/platform/coda/coda-common.c b/drivers/media/platform/coda/coda-common.c
> > index 9e6bdafa16f5..140c02715855 100644
> > --- a/drivers/media/platform/coda/coda-common.c
> > +++ b/drivers/media/platform/coda/coda-common.c
> > @@ -2078,7 +2078,7 @@ enum coda_platform {
> >  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"
> >                 },
> 
> What about just adding the new path without removing the original one?
> This way we avoid breakage for the users that use
> "vpu_fw_imx27_TO2.bin" path.

I considered that. Support for Freescale provided firmware is quite new 
(v4.6+), so I was not sure that supporting the current location is worth the 
bloat. What do others think?

baruch

-- 
     http://baruch.siach.name/blog/                  ~. .~   Tk Open Systems
=}------------------------------------------------ooO--U--Ooo------------{=
   - baruch@tkos.co.il - tel: +972.52.368.4656, http://www.tkos.co.il -