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

ASoC: Intel: add SOF firmare/topology file information 



Prepare for SOF integration, no functional change

Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Acked-by: default avatarLiam Girdwood <liam.r.girdwood@linux.intel.com>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 60046406

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

+30 −0
Original line number Diff line number Diff line
@@ -59,6 +59,9 @@ static struct snd_soc_acpi_mach byt_thinkpad_10 = { 
	.drv_name = "cht-bsw-rt5672",

	.fw_filename = "intel/fw_sst_0f28.bin",

	.board = "cht-bsw",

	.sof_fw_filename = "intel/reef-byt.ri",

	.sof_tplg_filename = "intel/reef-byt-rt5670.tplg",

	.asoc_plat_name = "sst-mfld-platform",

};



static struct snd_soc_acpi_mach *byt_quirk(void *arg)
@@ -95,36 +98,54 @@ 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 = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-rt5640.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5642",

		.drv_name = "bytcr_rt5640",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcr_rt5640",

		.sof_fw_filename = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-rt5640.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "INTCCFFD",

		.drv_name = "bytcr_rt5640",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcr_rt5640",

		.sof_fw_filename = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-rt5640.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5651",

		.drv_name = "bytcr_rt5651",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcr_rt5651",

		.sof_fw_filename = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-rt5651.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "DLGS7212",

		.drv_name = "bytcht_da7213",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcht_da7213",

		.sof_fw_filename = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-da7213.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "DLGS7213",

		.drv_name = "bytcht_da7213",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "bytcht_da7213",

		.sof_fw_filename = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-da7213.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	/* some Baytrail platforms rely on RT5645, use CHT machine driver */

	{
@@ -132,12 +153,18 @@ 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 = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5648",

		.drv_name = "cht-bsw-rt5645",

		.fw_filename = "intel/fw_sst_0f28.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	/* use CHT driver to Baytrail Chromebooks */

	{
@@ -145,6 +172,9 @@ 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 = "intel/reef-byt.ri",

		.sof_tplg_filename = "intel/reef-byt-max98090.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)

	/*

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

+39 −1
Original line number Diff line number Diff line
@@ -39,12 +39,14 @@ static const struct dmi_system_id cht_table[] = { 
	{ }

};





static struct snd_soc_acpi_mach cht_surface_mach = {

	.id = "10EC5640",

	.drv_name = "cht-bsw-rt5645",

	.fw_filename = "intel/fw_sst_22a8.bin",

	.board = "cht-bsw",

	.sof_fw_filename = "intel/reef-cht.ri",

	.sof_tplg_filename = "intel/reef-cht-rt5645.tplg",

	.asoc_plat_name = "sst-mfld-platform",

};



static struct snd_soc_acpi_mach *cht_quirk(void *arg)
@@ -66,54 +68,81 @@ 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/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5670.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5672",

		.drv_name = "cht-bsw-rt5672",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5670.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5645",

		.drv_name = "cht-bsw-rt5645",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC5650",

		.drv_name = "cht-bsw-rt5645",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC3270",

		.drv_name = "cht-bsw-rt5645",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5645.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "193C9890",

		.drv_name = "cht-bsw-max98090",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "cht-bsw",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-max98090.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "DLGS7212",

		.drv_name = "bytcht_da7213",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcht_da7213",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-da7213.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "DLGS7213",

		.drv_name = "bytcht_da7213",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcht_da7213",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-da7213.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "ESSX8316",

		.drv_name = "bytcht_es8316",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcht_es8316",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-es8316.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	/* some CHT-T platforms rely on RT5640, use Baytrail machine driver */

	{
@@ -122,12 +151,18 @@ 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/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5640.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	{

		.id = "10EC3276",

		.drv_name = "bytcr_rt5640",

		.fw_filename = "intel/fw_sst_22a8.bin",

		.board = "bytcr_rt5640",

		.sof_fw_filename = "intel/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5640.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

	/* some CHT-T platforms rely on RT5651, use Baytrail machine driver */

	{
@@ -135,6 +170,9 @@ 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/reef-cht.ri",

		.sof_tplg_filename = "intel/reef-cht-rt5651.tplg",

		.asoc_plat_name = "sst-mfld-platform",

	},

#if IS_ENABLED(CONFIG_SND_SOC_INTEL_BYT_CHT_NOCODEC_MACH)

	/*

sound/soc/intel/common/soc-acpi-intel-hsw-bdw-match.c

+12 −0
Original line number Diff line number Diff line
@@ -23,6 +23,9 @@ 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 = "intel/reef-hsw.ri",

		.sof_tplg_filename = "intel/reef-hsw.tplg",

		.asoc_plat_name = "haswell-pcm-audio",

	},

	{}

};
@@ -33,16 +36,25 @@ 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 = "intel/reef-bdw.ri",

		.sof_tplg_filename = "intel/reef-bdw-rt286.tplg",

		.asoc_plat_name = "haswell-pcm-audio",

	},

	{

		.id = "RT5677CE",

		.drv_name = "bdw-rt5677",

		.fw_filename =  "intel/IntcSST2.bin",

		.sof_fw_filename = "intel/reef-bdw.ri",

		.sof_tplg_filename = "intel/reef-bdw-rt286.tplg",

		.asoc_plat_name = "haswell-pcm-audio",

	},

	{

		.id = "INT33CA",

		.drv_name = "haswell-audio",

		.fw_filename = "intel/IntcSST2.bin",

		.sof_fw_filename = "intel/reef-bdw.ri",

		.sof_tplg_filename = "intel/reef-bdw-rt5640.tplg",

		.asoc_plat_name = "haswell-pcm-audio",

	},

	{}

};

CRA Git | Maintained and supported by SUSTech CRA and CCSE