ASoC: Intel: fix sst firmware path
Subsystems (3)
PATCH 1/1 ASoC: Intel: fix sst firmware path
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.
--- sound/soc/intel/sst/sst_acpi.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-)
sound/soc/intel/sst/sst_acpi.c +3 -3
@@ -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 }, {}, };
Signature · 1 line
1.9.1
Quoted 5 lines · On Wed, 4 Feb 2015 11:35:07 -0800 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 <[email protected]>
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
At Thu, 5 Feb 2015 11:56:06 +0000,
Quoted 8 lines · One Thousand Gnomes
Quoted 4 lines · On Wed, 4 Feb 2015 11:35:07 -0800 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.
Quoted 5 lines
Quoted 1 line
Signed-off-by Kevin Strasser <[email protected]>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
Mark Brown
maintainerQuoted 8 lines · Takashi Iwai
At Thu, 5 Feb 2015 11:56:06 +0000,
Quoted 3 lines
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.
Quoted 3 lines · 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.
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.
Quoted 9 lines · Mark Brown
Quoted 4 lines · 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.
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.
Mark Brown
maintainerQuoted 8 lines · Kevin Strasser
Quoted 3 lines · Mark Brown
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.
Quoted 7 lines · Kevin Strasser
Quoted 6 lines · Mark Brown
Quoted 4 lines · 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.
Quoted 6 lines
Quoted 3 lines
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
Signature · 1 line
~Vinod
PATCH v2 1/1 ASoC: Intel: fix sst firmware path for cht-bsw-rt5672
In reply to Kevin StrasserAll 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.
--- sound/soc/intel/sst/sst_acpi.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/sst/sst_acpi.c +1 -1
@@ -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 }, {}, };
Signature · 1 line
1.9.1
Re: [PATCH v2] ASoC: Intel: fix sst firmware path for cht-bsw-rt5672
Quoted 3 lines · 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.
Applied, thanks.