Skip to content

Commit 05de5cf

Browse files
plbossartbroonie
authored andcommitted
ASoC: SOF: Intel: pci-tgl: fix ADL-N descriptor
ADL-N uses a different signing key, which means we can't reuse the regular ADL descriptor used for ADL-P/M/S. Fixes: cd57eb3 ("ASoC: SOF: Intel: pci-tgl: add ADL-N support") Signed-off-by: Pierre-Louis Bossart <[email protected]> Reviewed-by: Ranjani Sridharan <[email protected]> Reviewed-by: Chao Song <[email protected]> Reviewed-by: Bard Liao <[email protected]> Link: https://lore.kernel.org/r/[email protected] Signed-off-by: Mark Brown <[email protected]>
1 parent 1dd5166 commit 05de5cf

File tree

1 file changed

+29
-1
lines changed

1 file changed

+29
-1
lines changed

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

Lines changed: 29 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -159,6 +159,34 @@ static const struct sof_dev_desc adl_desc = {
159159
.ops_init = sof_tgl_ops_init,
160160
};
161161

162+
static const struct sof_dev_desc adl_n_desc = {
163+
.machines = snd_soc_acpi_intel_adl_machines,
164+
.alt_machines = snd_soc_acpi_intel_adl_sdw_machines,
165+
.use_acpi_target_states = true,
166+
.resindex_lpe_base = 0,
167+
.resindex_pcicfg_base = -1,
168+
.resindex_imr_base = -1,
169+
.irqindex_host_ipc = -1,
170+
.chip_info = &tgl_chip_info,
171+
.ipc_supported_mask = BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),
172+
.ipc_default = SOF_IPC,
173+
.default_fw_path = {
174+
[SOF_IPC] = "intel/sof",
175+
[SOF_INTEL_IPC4] = "intel/avs/adl-n",
176+
},
177+
.default_tplg_path = {
178+
[SOF_IPC] = "intel/sof-tplg",
179+
[SOF_INTEL_IPC4] = "intel/avs-tplg",
180+
},
181+
.default_fw_filename = {
182+
[SOF_IPC] = "sof-adl-n.ri",
183+
[SOF_INTEL_IPC4] = "dsp_basefw.bin",
184+
},
185+
.nocodec_tplg_filename = "sof-adl-nocodec.tplg",
186+
.ops = &sof_tgl_ops,
187+
.ops_init = sof_tgl_ops_init,
188+
};
189+
162190
static const struct sof_dev_desc rpls_desc = {
163191
.machines = snd_soc_acpi_intel_rpl_machines,
164192
.alt_machines = snd_soc_acpi_intel_rpl_sdw_machines,
@@ -246,7 +274,7 @@ static const struct pci_device_id sof_pci_ids[] = {
246274
{ PCI_DEVICE(0x8086, 0x51cf), /* RPL-PX */
247275
.driver_data = (unsigned long)&rpl_desc},
248276
{ PCI_DEVICE(0x8086, 0x54c8), /* ADL-N */
249-
.driver_data = (unsigned long)&adl_desc},
277+
.driver_data = (unsigned long)&adl_n_desc},
250278
{ 0, }
251279
};
252280
MODULE_DEVICE_TABLE(pci, sof_pci_ids);

0 commit comments

Comments
 (0)