ASoC: soc-acpi: remove sof_fw_filename

We've been using a default firmware name for each PCI/ACPI/OF platform
for a while. The machine-specific sof_fw_filename is in practice not
different from the default, and newer devices don't set this field, so
let's remove the redundant definitions.

When OEMs modify the base firmware, they can keep the same firmware
name but store the file in a separate directory.

Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: Rander Wang <rander.wang@intel.com>
Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com>
Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20220301194903.60859-2-pierre-louis.bossart@linux.intel.com
Signed-off-by: Mark Brown <broonie@kernel.org>

diff --git a/include/sound/soc-acpi.h b/include/sound/soc-acpi.h
index ac0893df9c76d4025046fbb1d0ce3f02fac322c2..fdb536d699ff11469c3caf48cb4dbb297ffb1067 100644 (file)
--- a/include/sound/soc-acpi.h
+++ b/include/sound/soc-acpi.h
@@ -142,7 +142,6 @@ struct snd_soc_acpi_link_adr {
  * audio codecs whose presence if checked with ACPI
  * @pdata: intended for platform data or machine specific-ops. This structure
  *  is not constant since this field may be updated at run-time
- * @sof_fw_filename: Sound Open Firmware file name, if enabled
  * @sof_tplg_filename: Sound Open Firmware topology file name, if enabled
  */
 /* Descriptor for SST ASoC machine driver */
@@ -158,7 +157,6 @@ struct snd_soc_acpi_mach {
        const void *quirk_data;
        void *pdata;
        struct snd_soc_acpi_mach_params mach_params;
-       const char *sof_fw_filename;
        const char *sof_tplg_filename;
 };
 

diff --git a/sound/soc/intel/common/soc-acpi-intel-adl-match.c b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
index 20257f547275a8ed674dd0f3924c6b9b7850ddd0..86444e331d800ddf3b4fd54b9bf4b214fbdab2c9 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-adl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-adl-match.c
@@ -390,7 +390,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .drv_name = "adl_mx98373_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98373_amp,
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-max98373-rt5682.tplg",
        },
        {
@@ -398,7 +397,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .drv_name = "adl_mx98357_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98357a_amp,
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-max98357a-rt5682.tplg",
        },
        {
@@ -406,7 +404,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .drv_name = "adl_mx98360_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98360a_amp,
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-max98360a-rt5682.tplg",
        },
        {
@@ -414,7 +411,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .drv_name = "adl_rt1019p_nau8825",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_rt1019p_amp,
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-rt1019-nau8825.tplg",
        },
        {
@@ -422,7 +418,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .drv_name = "adl_max98373_nau8825",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98373_amp,
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-max98373-nau8825.tplg",
        },
        {
@@ -430,13 +425,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .drv_name = "adl_mx98360a_nau8825",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98360a_amp,
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-mx98360a-nau8825.tplg",
        },
        {
                .id = "10508825",
                .drv_name = "sof_nau8825",
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-nau8825.tplg",
        },
        {
@@ -444,13 +437,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[] = {
                .drv_name = "adl_max98390_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &adl_max98390_amp,
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-max98390-rt5682.tplg",
        },
        {
                .comp_ids = &adl_rt5682_rt5682s_hp,
                .drv_name = "adl_rt5682",
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-rt5682.tplg",
        },
        {},
@@ -481,21 +472,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
                .link_mask = 0xF, /* 4 active links required */
                .links = adl_sdw_rt711_link2_rt1316_link01_rt714_link3,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-rt711-l2-rt1316-l01-rt714-l3.tplg",
        },
        {
                .link_mask = 0xC, /* rt1316 on link2 & rt714 on link3 */
                .links = adl_sdw_rt1316_link2_rt714_link3,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-rt1316-l2-mono-rt714-l3.tplg",
        },
        {
                .link_mask = 0x7, /* rt714 on link0 & two rt1316s on link1 and link2 */
                .links = adl_sdw_rt1316_link12_rt714_link0,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-rt1316-l12-rt714-l0.tplg",
        },
        {
@@ -514,7 +502,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[] = {
                .link_mask = 0x5, /* rt5682 on link0 & 2xmax98373 on link 2 */
                .links = adl_chromebook_base,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-adl.ri",
                .sof_tplg_filename = "sof-adl-sdw-max98373-rt5682.tplg",
        },
        {},

diff --git a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
index 342d340522045489aeb18cee9fed70af5e0e8517..718947068956d6d504f1c9c8b4a87c71079a9467 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
@@ -51,7 +51,6 @@ 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 = "sof-apl.ri",
                .sof_tplg_filename = "sof-apl-rt298.tplg",
        },
        {
@@ -60,32 +59,27 @@ 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 = "sof-apl.ri",
                .sof_tplg_filename = "sof-apl-da7219.tplg",
        },
        {
                .id = "104C5122",
                .drv_name = "sof_pcm512x",
-               .sof_fw_filename = "sof-apl.ri",
                .sof_tplg_filename = "sof-apl-pcm512x.tplg",
        },
        {
                .id = "1AEC8804",
                .drv_name = "sof-wm8804",
-               .sof_fw_filename = "sof-apl.ri",
                .sof_tplg_filename = "sof-apl-wm8804.tplg",
        },
        {
                .id = "INT34C3",
                .drv_name = "bxt_tdf8532",
                .machine_quirk = apl_quirk,
-               .sof_fw_filename = "sof-apl.ri",
                .sof_tplg_filename = "sof-apl-tdf8532.tplg",
        },
        {
                .id = "ESSX8336",
                .drv_name = "sof-essx8336",
-               .sof_fw_filename = "sof-apl.ri",
                .sof_tplg_filename = "sof-apl-es8336.tplg",
        },
        {},

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 1420009918134c83111e27af44bb886359358c31..daa51885dc7f5b58c33aa4911d0a29d1307460bd 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-byt-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-byt-match.c
@@ -91,7 +91,6 @@ static struct snd_soc_acpi_mach byt_rt5672 = {
        .drv_name = "cht-bsw-rt5672",
        .fw_filename = "intel/fw_sst_0f28.bin",
        .board = "cht-bsw",
-       .sof_fw_filename = "sof-byt.ri",
        .sof_tplg_filename = "sof-byt-rt5670.tplg",
 };
 
@@ -100,7 +99,6 @@ 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 = "sof-byt.ri",
        .sof_tplg_filename = "sof-byt-rt5651.tplg",
 };
 
@@ -147,7 +145,6 @@ 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 = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-rt5640.tplg",
        },
        {
@@ -155,7 +152,6 @@ 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 = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-rt5651.tplg",
        },
        {
@@ -163,7 +159,6 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcr_wm5102",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcr_wm5102",
-               .sof_fw_filename = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-wm5102.tplg",
        },
        {
@@ -171,7 +166,6 @@ 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 = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-da7213.tplg",
        },
        {
@@ -179,13 +173,11 @@ 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 = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-es8316.tplg",
        },
        {
                .id = "10EC5682",
                .drv_name = "sof_rt5682",
-               .sof_fw_filename = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-rt5682.tplg",
        },
        /* some Baytrail platforms rely on RT5645, use CHT machine driver */
@@ -194,7 +186,6 @@ 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 = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-rt5645.tplg",
        },
        /* use CHT driver to Baytrail Chromebooks */
@@ -203,7 +194,6 @@ 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 = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-max98090.tplg",
        },
        {
@@ -211,7 +201,6 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_baytrail_machines[] = {
                .drv_name = "bytcht_cx2072x",
                .fw_filename = "intel/fw_sst_0f28.bin",
                .board = "bytcht_cx2072x",
-               .sof_fw_filename = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt-cx2072x.tplg",
        },
 #if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)

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 c60a5e8e7bc954dc33a8925f9e9deac2f107e1b4..6beb00858c33f5dfc68a6a75a8bdd6f1743e2e54 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cht-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cht-match.c
@@ -35,7 +35,6 @@ 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 = "sof-cht.ri",
        .sof_tplg_filename = "sof-cht-rt5645.tplg",
 };
 
@@ -79,7 +78,6 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-rt5670.tplg",
        },
        {
@@ -87,7 +85,6 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-rt5645.tplg",
        },
        {
@@ -95,7 +92,6 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-max98090.tplg",
        },
        {
@@ -103,7 +99,6 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-nau8824.tplg",
        },
        {
@@ -111,7 +106,6 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-da7213.tplg",
        },
        {
@@ -119,7 +113,6 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-es8316.tplg",
        },
        /* some CHT-T platforms rely on RT5640, use Baytrail machine driver */
@@ -129,13 +122,11 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-rt5640.tplg",
        },
        {
                .id = "10EC5682",
                .drv_name = "sof_rt5682",
-               .sof_fw_filename = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-rt5682.tplg",
        },
        /* some CHT-T platforms rely on RT5651, use Baytrail machine driver */
@@ -144,7 +135,6 @@ 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 = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-rt5651.tplg",
        },
        {
@@ -152,13 +142,11 @@ struct snd_soc_acpi_mach  snd_soc_acpi_intel_cherrytrail_machines[] = {
                .drv_name = "bytcht_cx2072x",
                .fw_filename = "intel/fw_sst_22a8.bin",
                .board = "bytcht_cx2072x",
-               .sof_fw_filename = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-cx2072x.tplg",
        },
        {
                .id = "104C5122",
                .drv_name = "sof_pcm512x",
-               .sof_fw_filename = "sof-cht.ri",
                .sof_tplg_filename = "sof-cht-src-50khz-pcm512x.tplg",
        },
 

diff --git a/sound/soc/intel/common/soc-acpi-intel-cml-match.c b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
index 4eebc79d4b486df60b07490e6f1cb19a8401f181..d033474f87689b4d3b275cc0b403320b29a69c7f 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cml-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cml-match.c
@@ -40,7 +40,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
                .drv_name = "cml_rt1011_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt1011_spk_codecs,
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt1011-rt5682.tplg",
        },
        {
@@ -48,7 +47,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
                .drv_name = "cml_rt1015_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt1015_spk_codecs,
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt1011-rt5682.tplg",
        },
        {
@@ -56,13 +54,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
                .drv_name = "sof_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &max98357a_spk_codecs,
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt5682-max98357a.tplg",
        },
        {
                .id = "10EC5682",
                .drv_name = "sof_rt5682",
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt5682.tplg",
        },
        {
@@ -70,7 +66,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
                .drv_name = "cml_da7219_mx98357a",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &max98357a_spk_codecs,
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-da7219-max98357a.tplg",
        },
        {
@@ -78,13 +73,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_machines[] = {
                .drv_name = "cml_da7219_mx98357a",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &max98390_spk_codecs,
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-da7219-max98390.tplg",
        },
        {
                .id = "ESSX8336",
                .drv_name = "sof-essx8336",
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-es8336.tplg",
        },
        {},
@@ -283,14 +276,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[] = {
                .link_mask = 0xF, /* 4 active links required */
                .links = cml_3_in_1_default,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt711-rt1308-rt715.tplg",
        },
        {
                .link_mask = 0xF, /* 4 active links required */
                .links = cml_3_in_1_sdca,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt711-rt1316-rt714.tplg",
        },
        {
@@ -302,14 +293,12 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[] = {
                .link_mask = 0xF,
                .links = cml_3_in_1_mono_amp,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt711-rt1308-mono-rt715.tplg",
        },
        {
                .link_mask = 0x2, /* RT700 connected on Link1 */
                .links = cml_rvp,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-cml.ri",
                .sof_tplg_filename = "sof-cml-rt700.tplg",
        },
        {}

diff --git a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
index 94b650767e11fb6ea0ed72460d9d9ad5aff898a5..8d3e8c3b589b0713394e3f4b726ab00e764e94c0 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
@@ -21,7 +21,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
                .drv_name = "cnl_rt274",
                .fw_filename = "intel/dsp_fw_cnl.bin",
                .pdata = &cnl_pdata,
-               .sof_fw_filename = "sof-cnl.ri",
                .sof_tplg_filename = "sof-cnl-rt274.tplg",
        },
        {},
@@ -58,21 +57,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[] = {
                .link_mask = BIT(2),
                .links = up_extreme_rt5682_2,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-cnl.ri",
                .sof_tplg_filename = "sof-cnl-rt5682-sdw2.tplg"
        },
        {
                .link_mask = GENMASK(3, 0),
                .links = sdw_mockup_headset_2amps_mic,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-cnl.ri",
                .sof_tplg_filename = "sof-cml-rt711-rt1308-rt715.tplg",
        },
        {
                .link_mask = BIT(0) | BIT(1) | BIT(3),
                .links = sdw_mockup_headset_1amp_mic,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-cnl.ri",
                .sof_tplg_filename = "sof-cml-rt711-rt1308-mono-rt715.tplg",
        },
        {}

diff --git a/sound/soc/intel/common/soc-acpi-intel-ehl-match.c b/sound/soc/intel/common/soc-acpi-intel-ehl-match.c
index 6222708a98e70d1645d44a99bc937ace618db710..84639c41a2683f94d038476f01510ef96b3777e0 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-ehl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-ehl-match.c
@@ -14,7 +14,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[] = {
        {
                .id = "10EC5660",
                .drv_name = "ehl_rt5660",
-               .sof_fw_filename = "sof-ehl.ri",
                .sof_tplg_filename = "sof-ehl-rt5660.tplg",
        },
        {},

diff --git a/sound/soc/intel/common/soc-acpi-intel-glk-match.c b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
index 8492b7e2a94500ad059aa8ca18f3cf420fd57688..c5ca077c7ac9e761ad1154078f0505b7c1b0cdf1 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-glk-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-glk-match.c
@@ -19,7 +19,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
                .id = "INT343A",
                .drv_name = "glk_alc298s_i2s",
                .fw_filename = "intel/dsp_fw_glk.bin",
-               .sof_fw_filename = "sof-glk.ri",
                .sof_tplg_filename = "sof-glk-alc298.tplg",
        },
        {
@@ -28,7 +27,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
                .fw_filename = "intel/dsp_fw_glk.bin",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &glk_codecs,
-               .sof_fw_filename = "sof-glk.ri",
                .sof_tplg_filename = "sof-glk-da7219.tplg",
        },
        {
@@ -37,7 +35,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
                .fw_filename = "intel/dsp_fw_glk.bin",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &glk_codecs,
-               .sof_fw_filename = "sof-glk.ri",
                .sof_tplg_filename = "sof-glk-rt5682.tplg",
        },
        {
@@ -45,7 +42,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
                .drv_name = "glk_rt5682_max98357a",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &glk_codecs,
-               .sof_fw_filename = "sof-glk.ri",
                .sof_tplg_filename = "sof-glk-rt5682.tplg",
        },
        {
@@ -54,13 +50,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
                .fw_filename = "intel/dsp_fw_glk.bin",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &glk_codecs,
-               .sof_fw_filename = "sof-glk.ri",
                .sof_tplg_filename = "sof-glk-cs42l42.tplg",
        },
        {
                .id = "ESSX8336",
                .drv_name = "sof-essx8336",
-               .sof_fw_filename = "sof-glk.ri",
                .sof_tplg_filename = "sof-glk-es8336.tplg",
        },
        {},

diff --git a/sound/soc/intel/common/soc-acpi-intel-hda-match.c b/sound/soc/intel/common/soc-acpi-intel-hda-match.c
index aa9cb522aac97939aabb05693c33757dd7a16432..2017fd0d676f1b4b3d6ccae14acb4a0fb35b5c82 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-hda-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-hda-match.c
@@ -21,8 +21,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_hda_machines[] = {
 
                /* .fw_filename is dynamically set in skylake driver */
 
-               /* .sof_fw_filename is dynamically set in sof/intel driver */
-
                .sof_tplg_filename = "sof-hda-generic.tplg",
 
                /*

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 fe343a95b5ff71e40cea67d99d702520ae8a13e8..0441df97b260573480f3fcc67c5b13477406cbdb 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
@@ -14,7 +14,6 @@ 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 = "sof-hsw.ri",
                .sof_tplg_filename = "sof-hsw.tplg",
        },
        {}
@@ -26,28 +25,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 = "sof-bdw.ri",
                .sof_tplg_filename = "sof-bdw-rt286.tplg",
        },
        {
                .id = "10EC5650",
                .drv_name = "bdw-rt5650",
                .fw_filename = "intel/IntcSST2.bin",
-               .sof_fw_filename = "sof-bdw.ri",
                .sof_tplg_filename = "sof-bdw-rt5650.tplg",
        },
        {
                .id = "RT5677CE",
                .drv_name = "bdw-rt5677",
                .fw_filename =  "intel/IntcSST2.bin",
-               .sof_fw_filename = "sof-bdw.ri",
                .sof_tplg_filename = "sof-bdw-rt5677.tplg",
        },
        {
                .id = "INT33CA",
                .drv_name = "haswell-audio",
                .fw_filename = "intel/IntcSST2.bin",
-               .sof_fw_filename = "sof-bdw.ri",
                .sof_tplg_filename = "sof-bdw-rt5640.tplg",
        },
        {}

diff --git a/sound/soc/intel/common/soc-acpi-intel-icl-match.c b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
index 768ed538c4ea6dde0cd94adc6fe414062ccd2bba..b032bc07de8bf520c8638c58b30bd2e1e7396428 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-icl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-icl-match.c
@@ -20,13 +20,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_machines[] = {
                .drv_name = "icl_rt274",
                .fw_filename = "intel/dsp_fw_icl.bin",
                .pdata = &icl_pdata,
-               .sof_fw_filename = "sof-icl.ri",
                .sof_tplg_filename = "sof-icl-rt274.tplg",
        },
        {
                .id = "10EC5682",
                .drv_name = "sof_rt5682",
-               .sof_fw_filename = "sof-icl.ri",
                .sof_tplg_filename = "sof-icl-rt5682.tplg",
        },
        {},
@@ -165,21 +163,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_sdw_machines[] = {
                .link_mask = 0xF, /* 4 active links required */
                .links = icl_3_in_1_default,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-icl.ri",
                .sof_tplg_filename = "sof-icl-rt711-rt1308-rt715.tplg",
        },
        {
                .link_mask = 0xB, /* 3 active links required */
                .links = icl_3_in_1_mono_amp,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-icl.ri",
                .sof_tplg_filename = "sof-icl-rt711-rt1308-rt715-mono.tplg",
        },
        {
                .link_mask = 0x1, /* rt700 connected on link0 */
                .links = icl_rvp,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-icl.ri",
                .sof_tplg_filename = "sof-icl-rt700.tplg",
        },
        {},

diff --git a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
index 278ec196da7bf4811334a7ada3be3994f1417173..a2da5cad520c84112c2983c9bad241992501ef76 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-jsl-match.c
@@ -43,7 +43,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        {
                .id = "DLGS7219",
                .drv_name = "sof_da7219_mx98373",
-               .sof_fw_filename = "sof-jsl.ri",
                .sof_tplg_filename = "sof-jsl-da7219.tplg",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &jsl_7219_98373_codecs,
@@ -51,13 +50,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        {
                .id = "DLGS7219",
                .drv_name = "sof_da7219_mx98360a",
-               .sof_fw_filename = "sof-jsl.ri",
                .sof_tplg_filename = "sof-jsl-da7219-mx98360a.tplg",
        },
        {
                .comp_ids = &rt5682_rt5682s_hp,
                .drv_name = "jsl_rt5682_rt1015",
-               .sof_fw_filename = "sof-jsl.ri",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt1015_spk,
                .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
@@ -65,7 +62,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        {
                .comp_ids = &rt5682_rt5682s_hp,
                .drv_name = "jsl_rt5682_rt1015p",
-               .sof_fw_filename = "sof-jsl.ri",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &rt1015p_spk,
                .sof_tplg_filename = "sof-jsl-rt5682-rt1015.tplg",
@@ -73,7 +69,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        {
                .comp_ids = &rt5682_rt5682s_hp,
                .drv_name = "jsl_rt5682_mx98360",
-               .sof_fw_filename = "sof-jsl.ri",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mx98360a_spk,
                .sof_tplg_filename = "sof-jsl-rt5682-mx98360a.tplg",
@@ -81,7 +76,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        {
                .id = "10134242",
                .drv_name = "jsl_cs4242_mx98360a",
-               .sof_fw_filename = "sof-jsl.ri",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &mx98360a_spk,
                .sof_tplg_filename = "sof-jsl-cs42l42-mx98360a.tplg",
@@ -89,7 +83,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[] = {
        {
                .id = "ESSX8336",
                .drv_name = "sof-essx8336",
-               .sof_fw_filename = "sof-jsl.ri",
                .sof_tplg_filename = "sof-jsl-es8336.tplg",
        },
        {},

diff --git a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
index da31bb3cca17cf2836b39d5fa5ccc428b72b8413..daff01466c058bb9c434783f0faa12337ced7f8b 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-tgl-match.c
@@ -369,7 +369,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
                .drv_name = "tgl_mx98357_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_codecs,
-               .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-max98357a-rt5682.tplg",
        },
        {
@@ -377,7 +376,6 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
                .drv_name = "tgl_mx98373_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_max98373_amp,
-               .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-max98373-rt5682.tplg",
        },
        {
@@ -385,13 +383,11 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[] = {
                .drv_name = "tgl_rt1011_rt5682",
                .machine_quirk = snd_soc_acpi_codec_list,
                .quirk_data = &tgl_rt1011_amp,
-               .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-rt1011-rt5682.tplg",
        },
        {
                .id = "ESSX8336",
                .drv_name = "sof-essx8336",
-               .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-es8336.tplg",
        },
        {},
@@ -405,21 +401,18 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[] = {
                .link_mask = GENMASK(3, 0),
                .links = sdw_mockup_headset_2amps_mic,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-rt711-rt1308-rt715.tplg",
        },
        {
                .link_mask = BIT(0) | BIT(1) | BIT(3),
                .links = sdw_mockup_headset_1amp_mic,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-rt711-rt1308-mono-rt715.tplg",
        },
        {
                .link_mask = BIT(0) | BIT(1) | BIT(2),
                .links = sdw_mockup_mic_headset_1amp,
                .drv_name = "sof_sdw",
-               .sof_fw_filename = "sof-tgl.ri",
                .sof_tplg_filename = "sof-tgl-rt715-rt711-rt1308-mono.tplg",
        },
        {

diff --git a/sound/soc/sof/intel/hda.c b/sound/soc/sof/intel/hda.c
index 659fe9d1a54230214690cdab097d4f9c767f2b87..e42b45722e9df703fd9cbceb20ac3f13d990f957 100644 (file)
--- a/sound/soc/sof/intel/hda.c
+++ b/sound/soc/sof/intel/hda.c
@@ -1313,10 +1313,7 @@ static struct snd_soc_acpi_mach *hda_sdw_machine_select(struct snd_sof_dev *sdev
                        mach->mach_params.links = mach->links;
                        mach->mach_params.link_mask = mach->link_mask;
                        mach->mach_params.platform = dev_name(sdev->dev);
-                       if (mach->sof_fw_filename)
-                               pdata->fw_filename = mach->sof_fw_filename;
-                       else
-                               pdata->fw_filename = pdata->desc->default_fw_filename;
+                       pdata->fw_filename = pdata->desc->default_fw_filename;
                        pdata->tplg_filename = mach->sof_tplg_filename;
 
                        /*

diff --git a/sound/soc/sof/intel/pci-tng.c b/sound/soc/sof/intel/pci-tng.c
index f8c841caa36226b441118024144959b8986b5dbb..7d5062f8076ea0da53ad22cc88d169a684e75967 100644 (file)
--- a/sound/soc/sof/intel/pci-tng.c
+++ b/sound/soc/sof/intel/pci-tng.c
@@ -25,7 +25,6 @@ static struct snd_soc_acpi_mach sof_tng_machines[] = {
        {
                .id = "INT343A",
                .drv_name = "edison",
-               .sof_fw_filename = "sof-byt.ri",
                .sof_tplg_filename = "sof-byt.tplg",
        },
        {}