Unverified Commit 302ee055 authored by Mark Brown's avatar Mark Brown
Browse files

ASoC: SOF: Intel: Fix build break 



Commit 130d3e90 (Fix CFL and CML FW nocodec binary names.) broke the
build in some configurations as it depends on changes in the development
branch, revert it.

Reported-by: default avatarStephen Rothwell <sfr@canb.auug.org.au>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 44d13f6c

sound/soc/sof/sof-pci-dev.c

+4 −4
Original line number Diff line number Diff line
@@ -113,7 +113,7 @@ static const struct sof_dev_desc cnl_desc = { 


#if IS_ENABLED(CONFIG_SND_SOC_SOF_COFFEELAKE)

static const struct sof_dev_desc cfl_desc = {

	.machines		= snd_soc_acpi_intel_cfl_machines,

	.machines		= snd_soc_acpi_intel_cnl_machines,

	.resindex_lpe_base	= 0,

	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,
@@ -122,7 +122,7 @@ static const struct sof_dev_desc cfl_desc = { 
	.chip_info = &cnl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

	.nocodec_fw_filename = "sof-cfl.ri",

	.nocodec_fw_filename = "sof-cnl.ri",

	.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",

	.ops = &sof_cnl_ops,

	.arch_ops = &sof_xtensa_arch_ops
@@ -133,7 +133,7 @@ static const struct sof_dev_desc cfl_desc = { 
	IS_ENABLED(CONFIG_SND_SOC_SOF_COMETLAKE_H)



static const struct sof_dev_desc cml_desc = {

	.machines		= snd_soc_acpi_intel_cml_machines,

	.machines		= snd_soc_acpi_intel_cnl_machines,

	.resindex_lpe_base	= 0,

	.resindex_pcicfg_base	= -1,

	.resindex_imr_base	= -1,
@@ -142,7 +142,7 @@ static const struct sof_dev_desc cml_desc = { 
	.chip_info = &cnl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

	.nocodec_fw_filename = "sof-cml.ri",

	.nocodec_fw_filename = "sof-cnl.ri",

	.nocodec_tplg_filename = "sof-cnl-nocodec.tplg",

	.ops = &sof_cnl_ops,

	.arch_ops = &sof_xtensa_arch_ops

CRA Git | Maintained and supported by SUSTech CRA and CCSE