[kernel: 60/85] update name of baytrail audio firmware file

[Adam Williamson]

commit 28e375d8b0b3b78ea9c55d5b96ce87758f707bcd
Author: Adam Williamson <awilliam at redhat.com>
Date:   Tue Sep 9 16:46:53 2014 -0700

    update name of baytrail audio firmware file

 ...-Intel-update-baytrail-adsp-firmware-name.patch |   30 ++++++++++++++++++++
 kernel.spec                                        |    7 ++++
 2 files changed, 37 insertions(+), 0 deletions(-)
---
diff --git a/ASoC-Intel-update-baytrail-adsp-firmware-name.patch b/ASoC-Intel-update-baytrail-adsp-firmware-name.patch
new file mode 100644
index 0000000..07f2de8
--- /dev/null
+++ b/ASoC-Intel-update-baytrail-adsp-firmware-name.patch
@@ -0,0 +1,30 @@
+From 9b11eb44eff7ede6bc3a94511cf9dfda75af9c9f Mon Sep 17 00:00:00 2001
+From: Jarkko Nikula <jarkko.nikula at linux.intel.com>
+Date: Wed, 6 Aug 2014 09:48:14 +0300
+Subject: [PATCH] ASoC: Intel: Update Baytrail ADSP firmware name
+
+Update the initial Baytrail ADSP firmware file name with the one that is now
+in linux-firmware.git. Please see linux-firmware.git commit 7551a3a78453
+("fw_sst_0f28: Add firmware for Intel Baytrail SST DSP").
+
+Signed-off-by: Jarkko Nikula <jarkko.nikula at linux.intel.com>
+Signed-off-by: Mark Brown <broonie at linaro.org>
+---
+ sound/soc/intel/sst-acpi.c | 4 ++--
+ 1 file changed, 2 insertions(+), 2 deletions(-)
+
+diff --git a/sound/soc/intel/sst-acpi.c b/sound/soc/intel/sst-acpi.c
+index 42edc6f..03d0a16 100644
+--- a/sound/soc/intel/sst-acpi.c
++++ b/sound/soc/intel/sst-acpi.c
+@@ -246,8 +246,8 @@ static struct sst_acpi_desc sst_acpi_broadwell_desc = {
+ };
+ 
+ static struct sst_acpi_mach baytrail_machines[] = {
+-	{ "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-i2s_master" },
+-	{ "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-i2s_master" },
++	{ "10EC5640", "byt-rt5640", "intel/fw_sst_0f28.bin-48kHz_i2s_master" },
++	{ "193C9890", "byt-max98090", "intel/fw_sst_0f28.bin-48kHz_i2s_master" },
+ 	{}
+ };
+ 
diff --git a/kernel.spec b/kernel.spec
index 2d82046..77988b3 100644
--- a/kernel.spec
+++ b/kernel.spec
@@ -655,6 +655,11 @@ Patch31010: 0001-ACPI-temporary-dep-solution-for-battery-support.patch
 # https://bugzilla.kernel.org/show_bug.cgi?id=67921
 Patch31011: baytrail_gpio_quirk_v3.patch
 
+# Update name of audio firmware file
+# http://comments.gmane.org/gmane.linux.alsa.devel/126117
+# Upstream 3.17
+Patch31012: ASoC-Intel-update-baytrail-adsp-firmware-name.patch
+
 # END OF AWB PATCH DEFINITIONS
 
 # END OF PATCH DEFINITIONS
@@ -1396,6 +1401,8 @@ ApplyPatch 0001-ACPI-temporary-dep-solution-for-battery-support.patch
 # Doesn't apply cleanly to 3.16
 #ApplyPatch baytrail_gpio_quirk_v3.patch
 
+ApplyPatch ASoC-Intel-update-baytrail-adsp-firmware-name.patch
+
 # END OF AWB (BAYTRAIL) PATCH APPLICATIONS
 
 # END OF PATCH APPLICATIONS