Unverified Commit 4ad03f89 authored by Sathya Prakash M R's avatar Sathya Prakash M R Committed by Mark Brown
Browse files

ASoC: SOF: Intel: Update ADL P to use its own descriptor 



ADL P has specific machines and hence having its own
table will help separate the machines and FW

Reviewed-by: default avatarBard Liao <bard.liao@intel.com>
Reviewed-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Signed-off-by: default avatarSathya Prakash M R <sathya.prakash.m.r@intel.com>
Signed-off-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Link: https://lore.kernel.org/r/20210412161519.13508-3-pierre-louis.bossart@linux.intel.com


Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 1b988997

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

+17 −1
Original line number Diff line number Diff line
@@ -86,6 +86,22 @@ static const struct sof_dev_desc adls_desc = { 
	.ops = &sof_tgl_ops,

};



static const struct sof_dev_desc adl_desc = {

	.machines               = snd_soc_acpi_intel_adl_machines,

	.alt_machines           = snd_soc_acpi_intel_adl_sdw_machines,

	.resindex_lpe_base      = 0,

	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.resindex_dma_base      = -1,

	.chip_info = &tgl_chip_info,

	.default_fw_path = "intel/sof",

	.default_tplg_path = "intel/sof-tplg",

	.default_fw_filename = "sof-adl.ri",

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

	.ops = &sof_tgl_ops,

};



/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

	{ PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */
@@ -99,7 +115,7 @@ static const struct pci_device_id sof_pci_ids[] = { 
	{ PCI_DEVICE(0x8086, 0x7ad0), /* ADL-S */

		.driver_data = (unsigned long)&adls_desc},

	{ PCI_DEVICE(0x8086, 0x51c8), /* ADL-P */

		.driver_data = (unsigned long)&tgl_desc},

		.driver_data = (unsigned long)&adl_desc},

	{ 0, }

};

MODULE_DEVICE_TABLE(pci, sof_pci_ids);

sound/soc/sof/intel/tgl.c

+1 −1
Original line number Diff line number Diff line
@@ -125,7 +125,7 @@ const struct snd_sof_dsp_ops sof_tgl_ops = { 
EXPORT_SYMBOL_NS(sof_tgl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);



const struct sof_intel_dsp_desc tgl_chip_info = {

	/* Tigerlake */

	/* Tigerlake , Alderlake */

	.cores_num = 4,

	.init_core_mask = 1,

	.host_managed_cores_mask = BIT(0),