ASoC: Intel: common: add ACPI matching tables for Raptor Lake
Subsystems (4)
Kai Vehmanen
maintainerPATCH 1/2 ASoC: Intel: common: add ACPI matching tables for Raptor Lake
Initial support for RPL w/ RT711
--- include/sound/soc-acpi-intel-match.h | 2 + sound/soc/intel/common/Makefile | 2 +- .../intel/common/soc-acpi-intel-rpl-match.c | 51 +++++++++++++++++++ 3 files changed, 54 insertions(+), 1 deletion(-) create mode 100644 sound/soc/intel/common/soc-acpi-intel-rpl-match.c
include/sound/soc-acpi-intel-match.h +2 -0
@@ -30,6 +30,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_ehl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_jsl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cnl_sdw_machines[];
@@ -38,6 +39,7 @@ extern struct snd_soc_acpi_mach snd_soc_acpi_intel_cml_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_icl_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_tgl_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_adl_sdw_machines[]; +extern struct snd_soc_acpi_mach snd_soc_acpi_intel_rpl_sdw_machines[];extern struct snd_soc_acpi_mach snd_soc_acpi_intel_mtl_sdw_machines[];/*
sound/soc/intel/common/Makefile +1 -1
@@ -9,7 +9,7 @@ snd-soc-acpi-intel-match-objs := soc-acpi-intel-byt-match.o soc-acpi-intel-cht-m soc-acpi-intel-cml-match.o soc-acpi-intel-icl-match.o \ soc-acpi-intel-tgl-match.o soc-acpi-intel-ehl-match.o \ soc-acpi-intel-jsl-match.o soc-acpi-intel-adl-match.o \ - soc-acpi-intel-mtl-match.o \ + soc-acpi-intel-rpl-match.o soc-acpi-intel-mtl-match.o \ soc-acpi-intel-hda-match.o \ soc-acpi-intel-sdw-mockup-match.o
sound/soc/intel/common/soc-acpi-intel-rpl-match.c new file +51 -0
51 lines not on this page · raw message
base-commit: efe30e2cb6ff87467389cece8ce604f6601059f9
Signature · 1 line
2.37.2
Kai Vehmanen
maintainerPATCH 2/2 ASoC: SOF: Intel: pci-tgl: use RPL specific firmware definitions
Split out firmware definitions for Intel Raptor Lake platforms.
--- sound/soc/sof/intel/pci-tgl.c | 62 +++++++++++++++++++++++++++++++++-- 1 file changed, 59 insertions(+), 3 deletions(-)
sound/soc/sof/intel/pci-tgl.c +59 -3
@@ -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 */
Signature · 1 line
2.37.2
Mark Brown
maintainerQuoted 3 lines · Kai Vehmanen
Initial support for RPL w/ RT711
Applied to
https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git for-next
Thanks!
[1/2] ASoC: Intel: common: add ACPI matching tables for Raptor Lake
commit: 5f3db54cfbc21772d984372fdcc5bb17b57f425f
[2/2] ASoC: SOF: Intel: pci-tgl: use RPL specific firmware definitions
commit: 63d375b9f2a99bb111e3fb5f3e2442a391988949All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted.
You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed.
If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced.
Please add any relevant lists and maintainers to the CCs when replying to this mail.
Thanks,
Mark