Skip to content

Commit e6d298f

Browse files
plbossartbroonie
authored andcommitted
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>
1 parent 65a3388 commit e6d298f

File tree

3 files changed

+12
-0
lines changed

3 files changed

+12
-0
lines changed

sound/soc/intel/common/soc-acpi-intel-bxt-match.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,6 +26,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_bxt_machines[] = {
2626
.fw_filename = "intel/dsp_fw_bxtn.bin",
2727
.machine_quirk = snd_soc_acpi_codec_list,
2828
.quirk_data = &bxt_codecs,
29+
.sof_fw_filename = "intel/sof-apl.ri",
30+
.sof_tplg_filename = "intel/sof-apl-da7219.tplg",
31+
.asoc_plat_name = "0000:00:0e.0",
2932
},
3033
{},
3134
};

sound/soc/intel/common/soc-acpi-intel-cnl-match.c

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -20,6 +20,9 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_machines[] = {
2020
.drv_name = "cnl_rt274",
2121
.fw_filename = "intel/dsp_fw_cnl.bin",
2222
.pdata = &cnl_pdata,
23+
.sof_fw_filename = "intel/sof-cnl.ri",
24+
.sof_tplg_filename = "intel/sof-cnl-rt274.tplg",
25+
.asoc_plat_name = "0000:00:1f.3",
2326
},
2427
{},
2528
};

sound/soc/intel/common/soc-acpi-intel-glk-match.c

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,13 +19,19 @@ struct snd_soc_acpi_mach snd_soc_acpi_intel_glk_machines[] = {
1919
.id = "INT343A",
2020
.drv_name = "glk_alc298s_i2s",
2121
.fw_filename = "intel/dsp_fw_glk.bin",
22+
.sof_fw_filename = "intel/sof-glk.ri",
23+
.sof_tplg_filename = "intel/sof-glk-alc298.tplg",
24+
.asoc_plat_name = "0000:00:0e.0",
2225
},
2326
{
2427
.id = "DLGS7219",
2528
.drv_name = "glk_da7219_max98357a",
2629
.fw_filename = "intel/dsp_fw_glk.bin",
2730
.machine_quirk = snd_soc_acpi_codec_list,
2831
.quirk_data = &glk_codecs,
32+
.sof_fw_filename = "intel/sof-glk.ri",
33+
.sof_tplg_filename = "intel/sof-glk-da7219.tplg",
34+
.asoc_plat_name = "0000:00:0e.0",
2935
},
3036
{},
3137
};

0 commit comments

Comments
 (0)