ASoC: Intel: cht-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-cht-match.c b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
index 91bb99b69601dded2e7aa2aa299d50dd4651db22..21ce4bcbf25b7e668a794d5e8b5fcc8e51430e9f 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
@@ -44,8 +44,8 @@ static struct snd_soc_acpi_mach cht_surface_mach = {
        .drv_name = "cht-bsw-rt5645",
        .fw_filename = "intel/fw_sst_22a8.bin",
        .board = "cht-bsw",
-       .sof_fw_filename = "intel/sof-cht.ri",
-       .sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
+       .sof_fw_filename = "sof-cht.ri",
+       .sof_tplg_filename = "sof-cht-rt5645.tplg",
        .asoc_plat_name = "sst-mfld-platform",
 };
 
@@ -68,8 +68,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "cht-bsw-rt5672",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5670.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5670.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -77,8 +77,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "cht-bsw-rt5672",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5670.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5670.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -86,8 +86,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "cht-bsw-rt5645",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5645.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -95,8 +95,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "cht-bsw-rt5645",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5645.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -104,8 +104,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "cht-bsw-rt5645",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5645.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5645.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -113,8 +113,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "cht-bsw-max98090",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-max98090.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-max98090.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -122,8 +122,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "cht-bsw-nau8824",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "cht-bsw",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-nau8824.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-nau8824.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -131,8 +131,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "bytcht_da7213",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "bytcht_da7213",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-da7213.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-da7213.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -140,8 +140,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "bytcht_da7213",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "bytcht_da7213",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-da7213.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-da7213.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -149,8 +149,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "bytcht_es8316",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "bytcht_es8316",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-es8316.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-es8316.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        /* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
@@ -160,8 +160,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "bytcr_rt5640",
                .machine_quirk = cht_quirk,
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5640.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5640.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        {
@@ -169,8 +169,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "bytcr_rt5640",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "bytcr_rt5640",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5640.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5640.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
        /* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
@@ -179,8 +179,8 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "bytcr_rt5651",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "bytcr_rt5651",
-               .sof_fw_filename = "intel/sof-cht.ri",
-               .sof_tplg_filename = "intel/sof-cht-rt5651.tplg",
+               .sof_fw_filename = "sof-cht.ri",
+               .sof_tplg_filename = "sof-cht-rt5651.tplg",
                .asoc_plat_name = "sst-mfld-platform",
        },
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)