Unverified Commit 63d375b9 authored by Kai Vehmanen's avatar Kai Vehmanen Committed by Mark Brown
Browse files

ASoC: SOF: Intel: pci-tgl: use RPL specific firmware definitions 



Split out firmware definitions for Intel Raptor Lake platforms.

Signed-off-by: default avatarKai Vehmanen <kai.vehmanen@linux.intel.com>
Reviewed-by: default avatarBard Liao <yung-chuan.liao@linux.intel.com>
Reviewed-by: default avatarPierre-Louis Bossart <pierre-louis.bossart@linux.intel.com>
Suggested-by: default avatarGopal Vamshi Krishna <vamshi.krishna.gopal@intel.com>
Link: https://lore.kernel.org/r/20220816130510.190427-2-kai.vehmanen@linux.intel.com


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

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

+59 −3
Original line number Diff line number Diff line
@@ -159,6 +159,62 @@ static const struct sof_dev_desc adl_desc = { 
	.ops_init = sof_tgl_ops_init,

};



static const struct sof_dev_desc rpls_desc = {

	.machines               = snd_soc_acpi_intel_rpl_machines,

	.alt_machines           = snd_soc_acpi_intel_rpl_sdw_machines,

	.use_acpi_target_states	= true,

	.resindex_lpe_base      = 0,

	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.chip_info = &adls_chip_info,

	.ipc_supported_mask	= BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),

	.ipc_default		= SOF_IPC,

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

		[SOF_INTEL_IPC4] = "intel/avs/rpl-s",

	},

	.default_tplg_path = {

		[SOF_IPC] = "intel/sof-tplg",

		[SOF_INTEL_IPC4] = "intel/avs-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC] = "sof-rpl-s.ri",

		[SOF_INTEL_IPC4] = "dsp_basefw.bin",

	},

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

	.ops = &sof_tgl_ops,

	.ops_init = sof_tgl_ops_init,

};



static const struct sof_dev_desc rpl_desc = {

	.machines               = snd_soc_acpi_intel_rpl_machines,

	.alt_machines           = snd_soc_acpi_intel_rpl_sdw_machines,

	.use_acpi_target_states = true,

	.resindex_lpe_base      = 0,

	.resindex_pcicfg_base   = -1,

	.resindex_imr_base      = -1,

	.irqindex_host_ipc      = -1,

	.chip_info = &tgl_chip_info,

	.ipc_supported_mask	= BIT(SOF_IPC) | BIT(SOF_INTEL_IPC4),

	.ipc_default		= SOF_IPC,

	.default_fw_path = {

		[SOF_IPC] = "intel/sof",

		[SOF_INTEL_IPC4] = "intel/avs/rpl",

	},

	.default_tplg_path = {

		[SOF_IPC] = "intel/sof-tplg",

		[SOF_INTEL_IPC4] = "intel/avs-tplg",

	},

	.default_fw_filename = {

		[SOF_IPC] = "sof-rpl.ri",

		[SOF_INTEL_IPC4] = "dsp_basefw.bin",

	},

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

	.ops = &sof_tgl_ops,

	.ops_init = sof_tgl_ops_init,

};



/* PCI IDs */

static const struct pci_device_id sof_pci_ids[] = {

	{ PCI_DEVICE(0x8086, 0xa0c8), /* TGL-LP */
@@ -172,7 +228,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, 0x7a50), /* RPL-S */

		.driver_data = (unsigned long)&adls_desc},

		.driver_data = (unsigned long)&rpls_desc},

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

		.driver_data = (unsigned long)&adl_desc},

	{ PCI_DEVICE(0x8086, 0x51cd), /* ADL-P */
@@ -180,9 +236,9 @@ static const struct pci_device_id sof_pci_ids[] = { 
	{ PCI_DEVICE(0x8086, 0x51c9), /* ADL-PS */

		.driver_data = (unsigned long)&adl_desc},

	{ PCI_DEVICE(0x8086, 0x51ca), /* RPL-P */

		.driver_data = (unsigned long)&adl_desc},

		.driver_data = (unsigned long)&rpl_desc},

	{ PCI_DEVICE(0x8086, 0x51cb), /* RPL-P */

		.driver_data = (unsigned long)&adl_desc},

		.driver_data = (unsigned long)&rpl_desc},

	{ PCI_DEVICE(0x8086, 0x51cc), /* ADL-M */

		.driver_data = (unsigned long)&adl_desc},

	{ PCI_DEVICE(0x8086, 0x54c8), /* ADL-N */