On Thu, 14 Jan 2021 12:55:58 +0100, Kai Vehmanen wrote:
Add PCI id for the AlderLake-P.
Signed-off-by: Kai Vehmanen kai.vehmanen@linux.intel.com Reviewed-by: Ranjani Sridharan ranjani.sridharan@linux.intel.com Reviewed-by: Pierre-Louis Bossart pierre-louis.bossart@linux.intel.com Reviewed-by: Guennadi Liakhovetski guennadi.liakhovetski@linux.intel.com
sound/soc/sof/sof-pci-dev.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-)
V2 changes:
- fix compile error if CONFIG_SND_SOC_SOF_TIGERLAKE=n and CONFIG_SND_SOC_SOF_ALDERLAKE is enabled
diff --git a/sound/soc/sof/sof-pci-dev.c b/sound/soc/sof/sof-pci-dev.c index 63b989e3ec40..ebd58d49d570 100644 --- a/sound/soc/sof/sof-pci-dev.c +++ b/sound/soc/sof/sof-pci-dev.c @@ -213,7 +213,7 @@ static const struct sof_dev_desc icl_desc = { }; #endif
-#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) +#if IS_ENABLED(CONFIG_SND_SOC_SOF_TIGERLAKE) || IS_ENABLED(CONFIG_SND_SOC_SOF_ALDERLAKE) static const struct sof_dev_desc tgl_desc = { .machines = snd_soc_acpi_intel_tgl_machines, .alt_machines = snd_soc_acpi_intel_tgl_sdw_machines,
I guess snd_soc_acpi_intel_tgl_* would be missing even by this patch alone if TIGERLAKE=n and ALDERLAKE=y.
IMO, the easiest fix would be to select CONFIG_SND_SOC_SOF_TIGERLAKE from CONFIG_SND_SOC_SOF_ALDERLAKE forcibly in Kconfig instead. Then no tweak of ifdef is needed.
thanks,
Takashi