ASoC: Intel: common: add firmware/topology information for SOF

No functionality change for Skylake driver, add relevant names needed
by SOF for BXT/APL, GLK and CNL.

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-bxt-match.c b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
index 569f1de97e82da80788af797c3e91a0836b49fc8..50869eddbb3b004f8d01c8b31671b6c2fff261cb 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-bxt-match.c
@@ -26,6 +26,9 @@ 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",
+               .asoc_plat_name = "0000:00:0e.0",
        },
        {},
 };

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 b83ee053d4176779320e4392a38ece13e48e05de..ec8e28e7b937aab8d763c8cc01d991a332a0b545 100644 (file)
--- a/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
+++ b/sound/soc/intel/common/soc-acpi-intel-cnl-match.c
@@ -20,6 +20,9 @@ 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 = "intel/sof-cnl.ri",
+               .sof_tplg_filename = "intel/sof-cnl-rt274.tplg",
+               .asoc_plat_name = "0000:00:1f.3",
        },
        {},
 };

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 5902aa1d0ee38fa4ada642c59f42147b636f65f3..305875af71caee65f498d3fda3262816d07ef637 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,6 +19,9 @@ 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 = "intel/sof-glk.ri",
+               .sof_tplg_filename = "intel/sof-glk-alc298.tplg",
+               .asoc_plat_name = "0000:00:0e.0",
        },
        {
                .id = "DLGS7219",
@@ -26,6 +29,9 @@ 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 = "intel/sof-glk.ri",
+               .sof_tplg_filename = "intel/sof-glk-da7219.tplg",
+               .asoc_plat_name = "0000:00:0e.0",
        },
        {},
 };