Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Unverified Commit e6d298fd authored by Pierre-Louis Bossart's avatar Pierre-Louis Bossart Committed by Mark Brown
Browse files

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: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 65a33883

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

+3 −0
Original line number Diff line number Diff line
@@ -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",

	},

	{},

};

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

+3 −0
Original line number Diff line number Diff line
@@ -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",

	},

	{},

};

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

+6 −0
Original line number Diff line number Diff line
@@ -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",

	},

	{},

};