On 7/11/2023 4:00 PM, Andy Shevchenko wrote:
On Tue, Jul 11, 2023 at 02:57:20PM +0200, Amadeusz Sławiński wrote:
Use PCI device IDs from pci_ids.h header. Also simplify comments for
Alder Lake and Raptor Lake platforms, as new IDs make it clear what
revision is in use.
Reviewed-by: Andy Shevchenko <andriy.shevchenko@xxxxxxxxxxxxxxx> # for Intel Tangier ID
One remark below.
Acked-by: Mark Brown <broonie@xxxxxxxxxx>
Signed-off-by: Amadeusz Sławiński <amadeuszx.slawinski@xxxxxxxxxxxxxxx>
---
sound/hda/intel-dsp-config.c | 119 ++++++++++++++++-------------------
1 file changed, 55 insertions(+), 64 deletions(-)
diff --git a/sound/hda/intel-dsp-config.c b/sound/hda/intel-dsp-config.c
index 317bdf6dcbef..2a71fa5ffec1 100644
--- a/sound/hda/intel-dsp-config.c
+++ b/sound/hda/intel-dsp-config.c
@@ -50,14 +50,14 @@ static const struct config_entry config_table[] = {
#if IS_ENABLED(CONFIG_SND_SOC_SOF_MERRIFIELD)
{
.flags = FLAG_SOF,
- .device = 0x119a,
+ .device = PCI_DEVICE_ID_INTEL_ADSP_TNG,
Yeah, somebody familiar with Intel history of SST/HDA/wtf should really
tell why HDA code is using this ID. Does it mean that SST implies HDA
always? Only for this (or this family of) platform?
It might affect the ID naming, but otherwise it's orthogonal to the series.
There were few early devices where DSP was separate unit:
Haswell, Broadwell - where we use ACPI to load (SND_SOC_INTEL_CATPT)
audio driver, Tangier/Merrifield - where ACPI or PCI is used to load
(SND_SST_ATOM_HIFI2_PLATFORM_PCI) audio driver.
All further generations are HDA devices with integrated DSP. This causes
all the weirdness ;)
