Skip to content

Commit d463bcd

Browse files
ujfalusibroonie
ujfalusi
authored and
broonie
committed
ASoC: SOF: Intel: pci-tgl: Change the default paths and firmware names
The currently used paths and firmware name reflects the reference firmware convention: default_fw_path: intel/avs/{platform_name} default_lib_path: intel/avs-lib/{platform_name} default_tplg_path: intel/avs-tplg default_fw_filename: dsp_basefw.bin The SOF supports building the firmware for cAVS2.5 platforms using IPC4 and it is the preferred IPC4 implementation to be used on these devices. Change the paths and firmware names to reflect this: default_fw_path: intel/sof-ipc4/{platform_name} default_lib_path: intel/sof-ipc4-lib/{platform_name} default_tplg_path: intel/sof-ipc4-tplg default_fw_filename: sof-{platform_name}.ri Signed-off-by: Peter Ujfalusi <peter.ujfalusi@linux.intel.com> Reviewed-by: Bard Liao <yung-chuan.liao@linux.intel.com> Reviewed-by: Kai Vehmanen <kai.vehmanen@linux.intel.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://msgid.link/r/20240213080418.21256-2-peter.ujfalusi@linux.intel.com Signed-off-by: Mark Brown <broonie@kernel.org>
1 parent f7fe85b commit d463bcd

File tree

1 file changed

+32
-32
lines changed

1 file changed

+32
-32
lines changed

‎sound/soc/sof/intel/pci-tgl.c

Lines changed: 32 additions & 32 deletions
Original file line numberDiff line numberDiff line change
@@ -33,18 +33,18 @@ static const struct sof_dev_desc tgl_desc = {
3333
.dspless_mode_supported = true, /* Only supported for HDaudio */
3434
.default_fw_path = {
3535
[SOF_IPC_TYPE_3] = "intel/sof",
36-
[SOF_IPC_TYPE_4] = "intel/avs/tgl",
36+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/tgl",
3737
},
3838
.default_lib_path = {
39-
[SOF_IPC_TYPE_4] = "intel/avs-lib/tgl",
39+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/tgl",
4040
},
4141
.default_tplg_path = {
4242
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
43-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
43+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
4444
},
4545
.default_fw_filename = {
4646
[SOF_IPC_TYPE_3] = "sof-tgl.ri",
47-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
47+
[SOF_IPC_TYPE_4] = "sof-tgl.ri",
4848
},
4949
.nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
5050
.ops = &sof_tgl_ops,
@@ -66,18 +66,18 @@ static const struct sof_dev_desc tglh_desc = {
6666
.dspless_mode_supported = true, /* Only supported for HDaudio */
6767
.default_fw_path = {
6868
[SOF_IPC_TYPE_3] = "intel/sof",
69-
[SOF_IPC_TYPE_4] = "intel/avs/tgl-h",
69+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/tgl-h",
7070
},
7171
.default_lib_path = {
72-
[SOF_IPC_TYPE_4] = "intel/avs-lib/tgl-h",
72+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/tgl-h",
7373
},
7474
.default_tplg_path = {
7575
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
76-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
76+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
7777
},
7878
.default_fw_filename = {
7979
[SOF_IPC_TYPE_3] = "sof-tgl-h.ri",
80-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
80+
[SOF_IPC_TYPE_4] = "sof-tgl-h.ri",
8181
},
8282
.nocodec_tplg_filename = "sof-tgl-nocodec.tplg",
8383
.ops = &sof_tgl_ops,
@@ -98,18 +98,18 @@ static const struct sof_dev_desc ehl_desc = {
9898
.dspless_mode_supported = true, /* Only supported for HDaudio */
9999
.default_fw_path = {
100100
[SOF_IPC_TYPE_3] = "intel/sof",
101-
[SOF_IPC_TYPE_4] = "intel/avs/ehl",
101+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/ehl",
102102
},
103103
.default_lib_path = {
104-
[SOF_IPC_TYPE_4] = "intel/avs-lib/ehl",
104+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/ehl",
105105
},
106106
.default_tplg_path = {
107107
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
108-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
108+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
109109
},
110110
.default_fw_filename = {
111111
[SOF_IPC_TYPE_3] = "sof-ehl.ri",
112-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
112+
[SOF_IPC_TYPE_4] = "sof-ehl.ri",
113113
},
114114
.nocodec_tplg_filename = "sof-ehl-nocodec.tplg",
115115
.ops = &sof_tgl_ops,
@@ -131,18 +131,18 @@ static const struct sof_dev_desc adls_desc = {
131131
.dspless_mode_supported = true, /* Only supported for HDaudio */
132132
.default_fw_path = {
133133
[SOF_IPC_TYPE_3] = "intel/sof",
134-
[SOF_IPC_TYPE_4] = "intel/avs/adl-s",
134+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/adl-s",
135135
},
136136
.default_lib_path = {
137-
[SOF_IPC_TYPE_4] = "intel/avs-lib/adl-s",
137+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/adl-s",
138138
},
139139
.default_tplg_path = {
140140
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
141-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
141+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
142142
},
143143
.default_fw_filename = {
144144
[SOF_IPC_TYPE_3] = "sof-adl-s.ri",
145-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
145+
[SOF_IPC_TYPE_4] = "sof-adl-s.ri",
146146
},
147147
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
148148
.ops = &sof_tgl_ops,
@@ -164,18 +164,18 @@ static const struct sof_dev_desc adl_desc = {
164164
.dspless_mode_supported = true, /* Only supported for HDaudio */
165165
.default_fw_path = {
166166
[SOF_IPC_TYPE_3] = "intel/sof",
167-
[SOF_IPC_TYPE_4] = "intel/avs/adl",
167+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/adl",
168168
},
169169
.default_lib_path = {
170-
[SOF_IPC_TYPE_4] = "intel/avs-lib/adl",
170+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/adl",
171171
},
172172
.default_tplg_path = {
173173
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
174-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
174+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
175175
},
176176
.default_fw_filename = {
177177
[SOF_IPC_TYPE_3] = "sof-adl.ri",
178-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
178+
[SOF_IPC_TYPE_4] = "sof-adl.ri",
179179
},
180180
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
181181
.ops = &sof_tgl_ops,
@@ -197,18 +197,18 @@ static const struct sof_dev_desc adl_n_desc = {
197197
.dspless_mode_supported = true, /* Only supported for HDaudio */
198198
.default_fw_path = {
199199
[SOF_IPC_TYPE_3] = "intel/sof",
200-
[SOF_IPC_TYPE_4] = "intel/avs/adl-n",
200+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/adl-n",
201201
},
202202
.default_lib_path = {
203-
[SOF_IPC_TYPE_4] = "intel/avs-lib/adl-n",
203+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/adl-n",
204204
},
205205
.default_tplg_path = {
206206
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
207-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
207+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
208208
},
209209
.default_fw_filename = {
210210
[SOF_IPC_TYPE_3] = "sof-adl-n.ri",
211-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
211+
[SOF_IPC_TYPE_4] = "sof-adl-n.ri",
212212
},
213213
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
214214
.ops = &sof_tgl_ops,
@@ -230,18 +230,18 @@ static const struct sof_dev_desc rpls_desc = {
230230
.dspless_mode_supported = true, /* Only supported for HDaudio */
231231
.default_fw_path = {
232232
[SOF_IPC_TYPE_3] = "intel/sof",
233-
[SOF_IPC_TYPE_4] = "intel/avs/rpl-s",
233+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/rpl-s",
234234
},
235235
.default_lib_path = {
236-
[SOF_IPC_TYPE_4] = "intel/avs-lib/rpl-s",
236+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/rpl-s",
237237
},
238238
.default_tplg_path = {
239239
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
240-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
240+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
241241
},
242242
.default_fw_filename = {
243243
[SOF_IPC_TYPE_3] = "sof-rpl-s.ri",
244-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
244+
[SOF_IPC_TYPE_4] = "sof-rpl-s.ri",
245245
},
246246
.nocodec_tplg_filename = "sof-rpl-nocodec.tplg",
247247
.ops = &sof_tgl_ops,
@@ -263,18 +263,18 @@ static const struct sof_dev_desc rpl_desc = {
263263
.dspless_mode_supported = true, /* Only supported for HDaudio */
264264
.default_fw_path = {
265265
[SOF_IPC_TYPE_3] = "intel/sof",
266-
[SOF_IPC_TYPE_4] = "intel/avs/rpl",
266+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4/rpl",
267267
},
268268
.default_lib_path = {
269-
[SOF_IPC_TYPE_4] = "intel/avs-lib/rpl",
269+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-lib/rpl",
270270
},
271271
.default_tplg_path = {
272272
[SOF_IPC_TYPE_3] = "intel/sof-tplg",
273-
[SOF_IPC_TYPE_4] = "intel/avs-tplg",
273+
[SOF_IPC_TYPE_4] = "intel/sof-ipc4-tplg",
274274
},
275275
.default_fw_filename = {
276276
[SOF_IPC_TYPE_3] = "sof-rpl.ri",
277-
[SOF_IPC_TYPE_4] = "dsp_basefw.bin",
277+
[SOF_IPC_TYPE_4] = "sof-rpl.ri",
278278
},
279279
.nocodec_tplg_filename = "sof-rpl-nocodec.tplg",
280280
.ops = &sof_tgl_ops,

0 commit comments

Comments
 (0)