summaryrefslogtreecommitdiffstats
path: root/sound/soc/sof/intel/pci-icl.c
diff options
context:
space:
mode:
authorPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>2022-04-14 20:48:06 +0200
committerMark Brown <broonie@kernel.org>2022-04-19 13:03:34 +0200
commita97abb3cae31b4e2420da96b95e54756333f2cc3 (patch)
treef5d083ab0c1640a0a7b7f938e3b261849230ee2e /sound/soc/sof/intel/pci-icl.c
parentASoC: SOF: add default IPC capability and file paths (diff)
downloadlinux-a97abb3cae31b4e2420da96b95e54756333f2cc3.tar.xz
linux-a97abb3cae31b4e2420da96b95e54756333f2cc3.zip
ASoC: SOF: add IPC-dependent file names
To avoid misleading file names, use different names for INTEL_IPC4 firmware files. Signed-off-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Rander Wang <rander.wang@intel.com> Reviewed-by: Péter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Chao Song <chao.song@intel.com> Link: https://lore.kernel.org/r/20220414184817.362215-5-pierre-louis.bossart@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
Diffstat (limited to 'sound/soc/sof/intel/pci-icl.c')
-rw-r--r--sound/soc/sof/intel/pci-icl.c10
1 files changed, 8 insertions, 2 deletions
diff --git a/sound/soc/sof/intel/pci-icl.c b/sound/soc/sof/intel/pci-icl.c
index c1ed81ba08bb..21bcd5d34b18 100644
--- a/sound/soc/sof/intel/pci-icl.c
+++ b/sound/soc/sof/intel/pci-icl.c
@@ -38,7 +38,10 @@ static const struct sof_dev_desc icl_desc = {
[SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg",
},
- .default_fw_filename = "sof-icl.ri",
+ .default_fw_filename = {
+ [SOF_IPC] = "sof-icl.ri",
+ [SOF_INTEL_IPC4] = "dsp_basefw.bin",
+ },
.nocodec_tplg_filename = "sof-icl-nocodec.tplg",
.ops = &sof_icl_ops,
};
@@ -61,7 +64,10 @@ static const struct sof_dev_desc jsl_desc = {
[SOF_IPC] = "intel/sof-tplg",
[SOF_INTEL_IPC4] = "intel/avs-tplg",
},
- .default_fw_filename = "sof-jsl.ri",
+ .default_fw_filename = {
+ [SOF_IPC] = "sof-jsl.ri",
+ [SOF_INTEL_IPC4] = "dsp_basefw.bin",
+ },
.nocodec_tplg_filename = "sof-jsl-nocodec.tplg",
.ops = &sof_cnl_ops,
};