LKML Archive on lore.kernel.org
help / color / mirror / Atom feed
* [PATCH] ASoC: Intel: fix sst firmware path
@ 2015-02-04 19:35 Kevin Strasser
  2015-02-05 11:56 ` One Thousand Gnomes
                   ` (2 more replies)
  0 siblings, 3 replies; 10+ messages in thread
From: Kevin Strasser @ 2015-02-04 19:35 UTC (permalink / raw)
  To: alsa-devel
  Cc: Liam Girdwood, Mark Brown, Vinod Koul, Mengdong Lin,
	linux-kernel, Yang Fang

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] ASoC: Intel: fix sst firmware path
  2015-02-04 19:35 [PATCH] ASoC: Intel: fix sst firmware path Kevin Strasser
@ 2015-02-05 11:56 ` One Thousand Gnomes
  2015-02-05 12:48   ` [alsa-devel] " Takashi Iwai
  2015-02-05 18:14 ` Mark Brown
  2015-02-05 20:12 ` [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672 Kevin Strasser
  2 siblings, 1 reply; 10+ messages in thread
From: One Thousand Gnomes @ 2015-02-05 11:56 UTC (permalink / raw)
  To: Kevin Strasser
  Cc: alsa-devel, Liam Girdwood, Mark Brown, Vinod Koul, Mengdong Lin,
	linux-kernel, Yang Fang

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path
  2015-02-05 11:56 ` One Thousand Gnomes
@ 2015-02-05 12:48   ` Takashi Iwai
  2015-02-05 14:37     ` Mark Brown
  0 siblings, 1 reply; 10+ messages in thread
From: Takashi Iwai @ 2015-02-05 12:48 UTC (permalink / raw)
  To: One Thousand Gnomes
  Cc: Kevin Strasser, alsa-devel, Vinod Koul, Mengdong Lin,
	Liam Girdwood, linux-kernel, Yang Fang, Mark Brown

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path
  2015-02-05 12:48   ` [alsa-devel] " Takashi Iwai
@ 2015-02-05 14:37     ` Mark Brown
  0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2015-02-05 14:37 UTC (permalink / raw)
  To: Takashi Iwai
  Cc: One Thousand Gnomes, Kevin Strasser, alsa-devel, Vinod Koul,
	Mengdong Lin, Liam Girdwood, linux-kernel, Yang Fang

[-- 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 --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH] ASoC: Intel: fix sst firmware path
  2015-02-04 19:35 [PATCH] ASoC: Intel: fix sst firmware path Kevin Strasser
  2015-02-05 11:56 ` One Thousand Gnomes
@ 2015-02-05 18:14 ` Mark Brown
  2015-02-05 18:48   ` [alsa-devel] " Kevin Strasser
  2015-02-05 20:12 ` [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672 Kevin Strasser
  2 siblings, 1 reply; 10+ messages in thread
From: Mark Brown @ 2015-02-05 18:14 UTC (permalink / raw)
  To: Kevin Strasser
  Cc: alsa-devel, Liam Girdwood, Vinod Koul, Mengdong Lin,
	linux-kernel, Yang Fang

[-- 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 --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path
  2015-02-05 18:14 ` Mark Brown
@ 2015-02-05 18:48   ` Kevin Strasser
  2015-02-05 19:17     ` Mark Brown
  2015-02-05 19:26     ` Vinod Koul
  0 siblings, 2 replies; 10+ messages in thread
From: Kevin Strasser @ 2015-02-05 18:48 UTC (permalink / raw)
  To: Mark Brown
  Cc: alsa-devel, Vinod Koul, Mengdong Lin, Liam Girdwood,
	linux-kernel, Yang Fang

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.

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path
  2015-02-05 18:48   ` [alsa-devel] " Kevin Strasser
@ 2015-02-05 19:17     ` Mark Brown
  2015-02-05 19:26     ` Vinod Koul
  1 sibling, 0 replies; 10+ messages in thread
From: Mark Brown @ 2015-02-05 19:17 UTC (permalink / raw)
  To: Kevin Strasser
  Cc: alsa-devel, Vinod Koul, Mengdong Lin, Liam Girdwood,
	linux-kernel, Yang Fang

[-- 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 --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [alsa-devel] [PATCH] ASoC: Intel: fix sst firmware path
  2015-02-05 18:48   ` [alsa-devel] " Kevin Strasser
  2015-02-05 19:17     ` Mark Brown
@ 2015-02-05 19:26     ` Vinod Koul
  1 sibling, 0 replies; 10+ messages in thread
From: Vinod Koul @ 2015-02-05 19:26 UTC (permalink / raw)
  To: Kevin Strasser
  Cc: Mark Brown, alsa-devel, Mengdong Lin, Liam Girdwood,
	linux-kernel, Yang Fang

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

^ permalink raw reply	[flat|nested] 10+ messages in thread

* [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672
  2015-02-04 19:35 [PATCH] ASoC: Intel: fix sst firmware path Kevin Strasser
  2015-02-05 11:56 ` One Thousand Gnomes
  2015-02-05 18:14 ` Mark Brown
@ 2015-02-05 20:12 ` Kevin Strasser
  2015-02-05 20:16   ` Mark Brown
  2 siblings, 1 reply; 10+ messages in thread
From: Kevin Strasser @ 2015-02-05 20:12 UTC (permalink / raw)
  To: alsa-devel
  Cc: Liam Girdwood, Mark Brown, Vinod Koul, Mengdong Lin,
	linux-kernel, Yang Fang

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


^ permalink raw reply	[flat|nested] 10+ messages in thread

* Re: [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672
  2015-02-05 20:12 ` [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672 Kevin Strasser
@ 2015-02-05 20:16   ` Mark Brown
  0 siblings, 0 replies; 10+ messages in thread
From: Mark Brown @ 2015-02-05 20:16 UTC (permalink / raw)
  To: Kevin Strasser
  Cc: alsa-devel, Liam Girdwood, Vinod Koul, Mengdong Lin,
	linux-kernel, Yang Fang

[-- 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 --]

^ permalink raw reply	[flat|nested] 10+ messages in thread

end of thread, other threads:[~2015-02-05 20:16 UTC | newest]

Thread overview: 10+ messages (download: mbox.gz / follow: Atom feed)
-- links below jump to the message on this page --
2015-02-04 19:35 [PATCH] ASoC: Intel: fix sst firmware path Kevin Strasser
2015-02-05 11:56 ` One Thousand Gnomes
2015-02-05 12:48   ` [alsa-devel] " Takashi Iwai
2015-02-05 14:37     ` Mark Brown
2015-02-05 18:14 ` Mark Brown
2015-02-05 18:48   ` [alsa-devel] " Kevin Strasser
2015-02-05 19:17     ` Mark Brown
2015-02-05 19:26     ` Vinod Koul
2015-02-05 20:12 ` [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672 Kevin Strasser
2015-02-05 20:16   ` Mark Brown

This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox;
as well as URLs for NNTP newsgroup(s).