ASoC: Intel: hsw-bdw-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: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
index 494a0ea9b02903a4e25c77c28780693cf327535b..ddfe4250c2bcb975756f2570f786f89cfaaa310b 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c
@@ -23,8 +23,8 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_haswell_machines[] = {
                .id = "INT33CA",
                .drv_name = "haswell-audio",
                .fw_filename = "intel/IntcSST1.bin",
-               .sof_fw_filename = "intel/sof-hsw.ri",
-               .sof_tplg_filename = "intel/sof-hsw.tplg",
+               .sof_fw_filename = "sof-hsw.ri",
+               .sof_tplg_filename = "sof-hsw.tplg",
                .asoc_plat_name = "haswell-pcm-audio",
        },
        {}
@@ -36,24 +36,24 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_broadwell_machines[] = {
                .id = "INT343A",
                .drv_name = "broadwell-audio",
                .fw_filename =  "intel/IntcSST2.bin",
-               .sof_fw_filename = "intel/sof-bdw.ri",
-               .sof_tplg_filename = "intel/sof-bdw-rt286.tplg",
+               .sof_fw_filename = "sof-bdw.ri",
+               .sof_tplg_filename = "sof-bdw-rt286.tplg",
                .asoc_plat_name = "haswell-pcm-audio",
        },
        {
                .id = "RT5677CE",
                .drv_name = "bdw-rt5677",
                .fw_filename =  "intel/IntcSST2.bin",
-               .sof_fw_filename = "intel/sof-bdw.ri",
-               .sof_tplg_filename = "intel/sof-bdw-rt5677.tplg",
+               .sof_fw_filename = "sof-bdw.ri",
+               .sof_tplg_filename = "sof-bdw-rt5677.tplg",
                .asoc_plat_name = "haswell-pcm-audio",
        },
        {
                .id = "INT33CA",
                .drv_name = "haswell-audio",
                .fw_filename = "intel/IntcSST2.bin",
-               .sof_fw_filename = "intel/sof-bdw.ri",
-               .sof_tplg_filename = "intel/sof-bdw-rt5640.tplg",
+               .sof_fw_filename = "sof-bdw.ri",
+               .sof_tplg_filename = "sof-bdw-rt5640.tplg",
                .asoc_plat_name = "haswell-pcm-audio",
        },
        {}