diff options
author | Kevin Strasser <kevin.strasser@linux.intel.com> | 2015-02-04 11:35:07 -0800 |
---|---|---|
committer | Mark Brown <broonie@kernel.org> | 2015-02-05 18:12:39 +0000 |
commit | e948262ad01fc683d893abe10d1161231b2a6457 (patch) | |
tree | aa06ab50e2a61cfb0542345db5c0d547be50a6ea /sound | |
parent | e18acdc04ab2c4125ed4020db7f49a8dc35d1979 (diff) | |
download | linux-stable-e948262ad01fc683d893abe10d1161231b2a6457.tar.gz linux-stable-e948262ad01fc683d893abe10d1161231b2a6457.tar.bz2 linux-stable-e948262ad01fc683d893abe10d1161231b2a6457.zip |
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.
Signed-off-by: Kevin Strasser <kevin.strasser@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r-- | sound/soc/intel/sst/sst_acpi.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/sound/soc/intel/sst/sst_acpi.c b/sound/soc/intel/sst/sst_acpi.c index 21b22e6a1ccb..378ef3c3042c 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 }, {}, }; |