proxmox-mirrors/mirror_ubuntu-kernels
1
0
Fork 0
mirror of https://git.proxmox.com/git/mirror_ubuntu-kernels.git synced 2025-11-25 16:33:36 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

ASoC: Intel: bxt-match: remove prefix for SOF files

Browse Source 
Prefix is now handled in the code. This allows for default and
alternate paths, and more flexibility for OEMs and distros

Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
Pierre-Louis Bossart 2019-02-08 17:45:41 -06:00 committed by Mark Brown
parent a404b72d2b
commit e529a9d44a
No known key found for this signature in database
GPG Key ID: 24D68B725D5487D0
1 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

20
sound/soc/intel/common/soc-acpi-intel-bxt-match.c
View File

@ -51,8 +51,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {
.id = "INT343A", .id = "INT343A",
.drv_name = "bxt_alc298s_i2s", .drv_name = "bxt_alc298s_i2s",
.fw_filename = "intel/dsp_fw_bxtn.bin", .fw_filename = "intel/dsp_fw_bxtn.bin",
.sof_fw_filename = "intel/sof-apl.ri", .sof_fw_filename = "sof-apl.ri",
.sof_tplg_filename = "intel/sof-apl-rt298.tplg", .sof_tplg_filename = "sof-apl-rt298.tplg",
.asoc_plat_name = "0000:00:0e.0", .asoc_plat_name = "0000:00:0e.0",
}, },
{ {
@ -61,30 +61,30 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {
.fw_filename = "intel/dsp_fw_bxtn.bin", .fw_filename = "intel/dsp_fw_bxtn.bin",
.machine_quirk = snd_soc_acpi_codec_list, .machine_quirk = snd_soc_acpi_codec_list,
.quirk_data = &bxt_codecs, .quirk_data = &bxt_codecs,
.sof_fw_filename = "intel/sof-apl.ri", .sof_fw_filename = "sof-apl.ri",
.sof_tplg_filename = "intel/sof-apl-da7219.tplg", .sof_tplg_filename = "sof-apl-da7219.tplg",
.asoc_plat_name = "0000:00:0e.0", .asoc_plat_name = "0000:00:0e.0",
}, },
{ {
.id = "104C5122", .id = "104C5122",
.drv_name = "bxt-pcm512x", .drv_name = "bxt-pcm512x",
.sof_fw_filename = "intel/sof-apl.ri", .sof_fw_filename = "sof-apl.ri",
.sof_tplg_filename = "intel/sof-apl-pcm512x.tplg", .sof_tplg_filename = "sof-apl-pcm512x.tplg",
.asoc_plat_name = "0000:00:0e.0", .asoc_plat_name = "0000:00:0e.0",
}, },
{ {
.id = "1AEC8804", .id = "1AEC8804",
.drv_name = "bxt-wm8804", .drv_name = "bxt-wm8804",
.sof_fw_filename = "intel/sof-apl.ri", .sof_fw_filename = "sof-apl.ri",
.sof_tplg_filename = "intel/sof-apl-wm8804.tplg", .sof_tplg_filename = "sof-apl-wm8804.tplg",
.asoc_plat_name = "0000:00:0e.0", .asoc_plat_name = "0000:00:0e.0",
}, },
{ {
.id = "INT34C3", .id = "INT34C3",
.drv_name = "bxt_tdf8532", .drv_name = "bxt_tdf8532",
.machine_quirk = apl_quirk, .machine_quirk = apl_quirk,
.sof_fw_filename = "intel/sof-apl.ri", .sof_fw_filename = "sof-apl.ri",
.sof_tplg_filename = "intel/sof-apl-tdf8532.tplg", .sof_tplg_filename = "sof-apl-tdf8532.tplg",
.asoc_plat_name = "0000:00:0e.0", .asoc_plat_name = "0000:00:0e.0",
}, },
{}, {},