Unverified Commit e529a9d4 authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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



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

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent a404b72d

sound/soc/intel/common/soc-acpi-intel-bxt-match.c

+10 −10
Original line number Diff line number Diff line
@@ -51,8 +51,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = { 
		.id = "INT343A",

		.drv_name = "bxt_alc298s_i2s",

		.fw_filename = "intel/dsp_fw_bxtn.bin",

		.sof_fw_filename = "intel/sof-apl.ri",

		.sof_tplg_filename = "intel/sof-apl-rt298.tplg",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-rt298.tplg",

		.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",

		.machine_quirk = snd_soc_acpi_codec_list,

		.quirk_data = &bxt_codecs,

		.sof_fw_filename = "intel/sof-apl.ri",

		.sof_tplg_filename = "intel/sof-apl-da7219.tplg",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-da7219.tplg",

		.asoc_plat_name = "0000:00:0e.0",

	},

	{

		.id = "104C5122",

		.drv_name = "bxt-pcm512x",

		.sof_fw_filename = "intel/sof-apl.ri",

		.sof_tplg_filename = "intel/sof-apl-pcm512x.tplg",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-pcm512x.tplg",

		.asoc_plat_name = "0000:00:0e.0",

	},

	{

		.id = "1AEC8804",

		.drv_name = "bxt-wm8804",

		.sof_fw_filename = "intel/sof-apl.ri",

		.sof_tplg_filename = "intel/sof-apl-wm8804.tplg",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-wm8804.tplg",

		.asoc_plat_name = "0000:00:0e.0",

	},

	{

		.id = "INT34C3",

		.drv_name = "bxt_tdf8532",

		.machine_quirk = apl_quirk,

		.sof_fw_filename = "intel/sof-apl.ri",

		.sof_tplg_filename = "intel/sof-apl-tdf8532.tplg",

		.sof_fw_filename = "sof-apl.ri",

		.sof_tplg_filename = "sof-apl-tdf8532.tplg",

		.asoc_plat_name = "0000:00:0e.0",

	},

	{},

CRA Git | Maintained and supported by SUSTech CRA and CCSE