Skip to contentSkip to conversation

ASoC: Intel: Fix BYTCR firmware name

PATCH Applied Jarkko Nikula 2 participants 3 messages Dec 22, 2014

Subsystems (3)
Sound ASoC Intel ASoC drivers
lore
Share & tools
lore

Jarkko Nikula

author
#0 lore raw

PATCH 1/2 ASoC: Intel: Fix BYTCR firmware name

BYTCR DSP firmware is in intel/ subdirectory. See linux-firmware.git commit d562a3b63632 ("linux-firmware: add sst audio firmware for baytrail platforms").

Signed-off-by Jarkko Nikula <[email protected]>
---
 sound/soc/intel/sst/sst_acpi.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/sst/sst_acpi.c +1 -1
index 3abc29e8a928..2ac72eb5e75d 100644
@@ -343,7 +343,7 @@ 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 },
 	{},
 };
Signature · 1 line
2.1.3
author
#1 lore raw

PATCH 2/2 ASoC: Intel: Fix BYTCR machine driver MODULE_ALIAS

snd_soc_sst_bytcr_dpcm_rt5640 doesn't autoload because MODULE_ALIAS doesn't match with "bytt100_rt5640" platform device.

Signed-off-by Jarkko Nikula <[email protected]>
Cc Subhransu S. Prusty <[email protected]>
---
 sound/soc/intel/bytcr_dpcm_rt5640.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)
sound/soc/intel/bytcr_dpcm_rt5640.c +1 -1
index f5d0fc1ab10c..eef0c56ec32e 100644
@@ -227,4 +227,4 @@ module_platform_driver(snd_byt_mc_driver);
 MODULE_DESCRIPTION("ASoC Intel(R) Baytrail CR Machine driver");
 MODULE_AUTHOR("Subhransu S. Prusty <[email protected]>");
 MODULE_LICENSE("GPL v2");
-MODULE_ALIAS("platform:bytrt5640-audio");
+MODULE_ALIAS("platform:bytt100_rt5640");
Signature · 1 line
2.1.3
maintainer Applied
#2 lore raw
In reply to Jarkko Nikula
Quoted 3 lines · Jarkko Nikula

BYTCR DSP firmware is in intel/ subdirectory. See linux-firmware.git commit d562a3b63632 ("linux-firmware: add sst audio firmware for baytrail platforms").

Applied both, thanks.