[PATCH] ASoC: Intel: fix sst firmware path

[PATCH] ASoC: Intel: fix sst firmware path

[Kevin Strasser]

All sst firmware is provided under the intel directory of the linux-firmware
tree. By default this directory structure is kept when installing on a target
system. Change the path to expect a default linux-firmware installation.

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 sound/soc/intel/sst/sst_acpi.c | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index 21b22e6..378ef3c 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -343,16 +343,16 @@ static int sst_acpi_remove(struct platform_device *pdev)
 }
 
 static struct sst_machines sst_acpi_bytcr[] = {
-	{"10EC5640", "T100", "bytt100_rt5640", NULL, "fw_sst_0f28.bin",
+	{"10EC5640", "T100", "bytt100_rt5640", NULL, "intel/fw_sst_0f28.bin",
 						&byt_rvp_platform_data },
 	{},
 };
 
 /* Cherryview-based platforms: CherryTrail and Braswell */
 static struct sst_machines sst_acpi_chv[] = {
-	{"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "fw_sst_22a8.bin",
+	{"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "intel/fw_sst_22a8.bin",
 						&chv_platform_data },
-	{"10EC5645", "cht-bsw", "cht-bsw-rt5645", NULL, "fw_sst_22a8.bin",
+	{"10EC5645", "cht-bsw", "cht-bsw-rt5645", NULL, "intel/fw_sst_22a8.bin",
 						&chv_platform_data },
 	{},
 };
-- 
1.9.1

Re: [PATCH] ASoC: Intel: fix sst firmware path

[One Thousand Gnomes]

On Wed,  4 Feb 2015 11:35:07 -0800
Kevin Strasser <kevin.strasser@linux.intel.com> wrote:

> All sst firmware is provided under the intel directory of the linux-firmware
> tree. By default this directory structure is kept when installing on a target
> system. Change the path to expect a default linux-firmware installation.
> 
> Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>

You just broken existing systems. I agree entirely with your change - but
you need to search both paths for now and maybe in a few years time remove
the old path.

Alan

Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path

[Takashi Iwai]

At Thu, 5 Feb 2015 11:56:06 +0000,
One Thousand Gnomes wrote:
> 
> On Wed,  4 Feb 2015 11:35:07 -0800
> Kevin Strasser <kevin.strasser@linux.intel.com> wrote:
> 
> > All sst firmware is provided under the intel directory of the linux-firmware
> > tree. By default this directory structure is kept when installing on a target
> > system. Change the path to expect a default linux-firmware installation.
> > 
> > Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
> 
> You just broken existing systems. I agree entirely with your change - but
> you need to search both paths for now and maybe in a few years time remove
> the old path.

IMO, it's fine in this case, as this stuff is new, merged first in
3.19.


thanks,

Takashi

Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 394 bytes --]

On Thu, Feb 05, 2015 at 01:48:52PM +0100, Takashi Iwai wrote:
> At Thu, 5 Feb 2015 11:56:06 +0000,

> > You just broken existing systems. I agree entirely with your change - but
> > you need to search both paths for now and maybe in a few years time remove
> > the old path.

> IMO, it's fine in this case, as this stuff is new, merged first in
> 3.19.

Yup, so long as we get this into v3.19.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [PATCH] ASoC: Intel: fix sst firmware path

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 466 bytes --]

On Wed, Feb 04, 2015 at 11:35:07AM -0800, Kevin Strasser wrote:
> All sst firmware is provided under the intel directory of the linux-firmware
> tree. By default this directory structure is kept when installing on a target
> system. Change the path to expect a default linux-firmware installation.

Applied, thanks.  It doesn't apply as a fix but that seems to be OK as
the only request_firmware() I spotted there appears to use intel/
prefixed directories already.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path

[Kevin Strasser]

On Thu, Feb 05, 2015 at 06:14:58PM +0000, Mark Brown wrote:
> On Wed, Feb 04, 2015 at 11:35:07AM -0800, Kevin Strasser wrote:
> > All sst firmware is provided under the intel directory of the linux-firmware
> > tree. By default this directory structure is kept when installing on a
> > target system. Change the path to expect a default linux-firmware
> > installation.
> 
> Applied, thanks.  It doesn't apply as a fix but that seems to be OK as the
> only request_firmware() I spotted there appears to use intel/ prefixed
> directories already.

I'm a little confused. Do you want me to submit a version that can be applied as
a fix? It seems to me that we want this patch in 3.19.

Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 548 bytes --]

On Thu, Feb 05, 2015 at 10:48:22AM -0800, Kevin Strasser wrote:
> On Thu, Feb 05, 2015 at 06:14:58PM +0000, Mark Brown wrote:

> > Applied, thanks.  It doesn't apply as a fix but that seems to be OK as the
> > only request_firmware() I spotted there appears to use intel/ prefixed
> > directories already.

> I'm a little confused. Do you want me to submit a version that can be applied as
> a fix? It seems to me that we want this patch in 3.19.

Yes, if you want this in v3.19 you need to send me something that can be
applied to the v3.19 code.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]

Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path

[Vinod Koul]

On Thu, Feb 05, 2015 at 10:48:22AM -0800, Kevin Strasser wrote:
> On Thu, Feb 05, 2015 at 06:14:58PM +0000, Mark Brown wrote:
> > On Wed, Feb 04, 2015 at 11:35:07AM -0800, Kevin Strasser wrote:
> > > All sst firmware is provided under the intel directory of the linux-firmware
> > > tree. By default this directory structure is kept when installing on a
> > > target system. Change the path to expect a default linux-firmware
> > > installation.
> > 
> > Applied, thanks.  It doesn't apply as a fix but that seems to be OK as the
> > only request_firmware() I spotted there appears to use intel/ prefixed
> > directories already.
> 
> I'm a little confused. Do you want me to submit a version that can be applied as
> a fix? It seems to me that we want this patch in 3.19.
This patch wont apply as is, Mark requires you need to provide a patch
which can be applied against 3.19

-- 
~Vinod

[PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672

[Kevin Strasser]

All sst firmware is provided under the intel directory of the linux-firmware
tree. By default this directory structure is kept when installing on a target
system. Change the path to expect a default linux-firmware installation.

Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
---
 sound/soc/intel/sst/sst_acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c
index 2ac72eb..b336013 100644
--- a/sound/soc/intel/sst/sst_acpi.c
+++ b/sound/soc/intel/sst/sst_acpi.c
@@ -350,7 +350,7 @@ static struct sst_machines sst_acpi_bytcr[] = {
 
 /* Cherryview-based platforms: CherryTrail and Braswell */
 static struct sst_machines sst_acpi_chv[] = {
-	{"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "fw_sst_22a8.bin",
+	{"10EC5670", "cht-bsw", "cht-bsw-rt5672", NULL, "intel/fw_sst_22a8.bin",
 						&chv_platform_data },
 	{},
 };
-- 
1.9.1

Re: [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672

[Mark Brown]

[-- Attachment #1: Type: text/plain, Size: 316 bytes --]

On Thu, Feb 05, 2015 at 12:12:07PM -0800, Kevin Strasser wrote:
> All sst firmware is provided under the intel directory of the linux-firmware
> tree. By default this directory structure is kept when installing on a target
> system. Change the path to expect a default linux-firmware installation.

Applied, thanks.

[-- Attachment #2: Digital signature --]
[-- Type: application/pgp-signature, Size: 473 bytes --]