Unverified Commit 13a9e21b authored by Mark Brown's avatar Mark Brown
Browse files

Merge series "ASoC: SOF: Intel: descriptor corrections for TGL and ADL" from... 

Merge series "ASoC: SOF: Intel: descriptor corrections for TGL and ADL" from Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>:

One missed property for TigerLake and need for separate descriptors
between ADL-S and the other flavors.

Libin Yang (1):
  ASoC: SOF: Intel: add missing use_acpi_target_states for TGL platforms

Sathya Prakash M R (1):
  ASoC: SOF: Intel: Update ADL P to use its own descriptor

 sound/soc/sof/intel/pci-tgl.c | 20 +++++++++++++++++++-
 sound/soc/sof/intel/tgl.c     |  2 +-
 2 files changed, 20 insertions(+), 2 deletions(-)

--
2.25.1
parents 2976eef2 4ad03f89

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

+19 −1
Original line number Original line Diff line number Diff line
@@ -39,6 +39,7 @@ static const struct sof_dev_desc tgl_desc = { 
static const struct sof_dev_desc tglh_desc = {

static const struct sof_dev_desc tglh_desc = {

	.machines               = snd_soc_acpi_intel_tgl_machines,

	.machines               = snd_soc_acpi_intel_tgl_machines,

	.alt_machines		= snd_soc_acpi_intel_tgl_sdw_machines,

	.alt_machines		= snd_soc_acpi_intel_tgl_sdw_machines,

	.use_acpi_target_states	= true,

	.resindex_lpe_base      = 0,

	.resindex_lpe_base      = 0,

	.resindex_pcicfg_base   = -1,

	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.resindex_imr_base      = -1,
@@ -71,6 +72,7 @@ static const struct sof_dev_desc ehl_desc = { 
static const struct sof_dev_desc adls_desc = {

static const struct sof_dev_desc adls_desc = {

	.machines               = snd_soc_acpi_intel_adl_machines,

	.machines               = snd_soc_acpi_intel_adl_machines,

	.alt_machines           = snd_soc_acpi_intel_adl_sdw_machines,

	.alt_machines           = snd_soc_acpi_intel_adl_sdw_machines,

	.use_acpi_target_states	= true,

	.resindex_lpe_base      = 0,

	.resindex_lpe_base      = 0,

	.resindex_pcicfg_base   = -1,

	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.resindex_imr_base      = -1,
@@ -84,6 +86,22 @@ static const struct sof_dev_desc adls_desc = { 
	.ops = &sof_tgl_ops,

	.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 */

/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

static const struct pci_device_id sof_pci_ids[] = {

	{ PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */

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

	{ PCI_DEVICE(0x8086, 0x7ad0), /* ADL-S */

		.driver_data = (unsigned long)&adls_desc},

		.driver_data = (unsigned long)&adls_desc},

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

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

		.driver_data = (unsigned long)&tgl_desc},

		.driver_data = (unsigned long)&adl_desc},

	{ 0, }

	{ 0, }

};

};

MODULE_DEVICE_TABLE(pci, sof_pci_ids);

MODULE_DEVICE_TABLE(pci, sof_pci_ids);

sound/soc/sof/intel/tgl.c

+1 −1
Original line number Original line 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);

EXPORT_SYMBOL_NS(sof_tgl_ops, SND_SOC_SOF_INTEL_HDA_COMMON);





const struct sof_intel_dsp_desc tgl_chip_info = {

const struct sof_intel_dsp_desc tgl_chip_info = {

	/* Tigerlake */

	/* Tigerlake , Alderlake */

	.cores_num = 4,

	.cores_num = 4,

	.init_core_mask = 1,

	.init_core_mask = 1,

	.host_managed_cores_mask = BIT(0),

	.host_managed_cores_mask = BIT(0),