ASoC: Intel: byt-match.c: 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-byt-match.c b/sound/soc/intel/common/soc-acpi-intel-byt-match.c
index 96f9c55..a46a351 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-byt-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-byt-match.c
@@ -83,8 +83,8 @@ static struct snd_soc_acpi_mach byt_thinkpad_10 = {
        .drv_name = "cht-bsw-rt5672",
        .fw_filename = "intel/fw_sst_0f28.bin",
        .board = "cht-bsw",
-       .sof_fw_filename = "intel/sof-byt.ri",
-       .sof_tplg_filename = "intel/sof-byt-rt5670.tplg",
+       .sof_fw_filename = "sof-byt.ri",
+       .sof_tplg_filename = "sof-byt-rt5670.tplg",
        .asoc_plat_name = "sst-mfld-platform",
 };
 
@@ -93,8 +93,8 @@ static struct snd_soc_acpi_mach byt_pov_p1006w = {
        .drv_name = "bytcr_rt5651",
        .fw_filename = "intel/fw_sst_0f28.bin",
        .board = "bytcr_rt5651",
-       .sof_fw_filename = "intel/sof-byt.ri",
-       .sof_tplg_filename = "intel/sof-byt-rt5651.tplg",
+       .sof_fw_filename = "sof-byt.ri",
+       .sof_tplg_filename = "sof-byt-rt5651.tplg",
        .asoc_plat_name = "sst-mfld-platform",
 };
 
@@ -136,8 +136,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcr_rt5640",
                .machine_quirk = byt_quirk,
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-rt5640.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-rt5640.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -145,8 +145,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcr_rt5640",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcr_rt5640",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-rt5640.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-rt5640.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -154,8 +154,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcr_rt5640",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcr_rt5640",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-rt5640.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-rt5640.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -163,8 +163,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcr_rt5651",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcr_rt5651",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-rt5651.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-rt5651.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -172,8 +172,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcht_da7213",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcht_da7213",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-da7213.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-da7213.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -181,8 +181,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcht_da7213",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcht_da7213",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-da7213.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-da7213.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -190,8 +190,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcht_es8316",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcht_es8316",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-es8316.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-es8316.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        /* some Baytrail platforms rely on RT5645, use CHT machine driver */
@@ -200,8 +200,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "cht-bsw-rt5645",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-rt5645.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-rt5645.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -209,8 +209,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "cht-bsw-rt5645",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-rt5645.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-rt5645.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        /* use CHT driver to Baytrail Chromebooks */
@@ -219,8 +219,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "cht-bsw-max98090",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-byt.ri",
-               .sof_tplg_filename = "intel/sof-byt-max98090.tplg",
+               .sof_fw_filename = "sof-byt.ri",
+               .sof_tplg_filename = "sof-byt-max98090.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)