summaryrefslogtreecommitdiffstats
path: root/sound
diff options
context:
space:
mode:
authorRichard Fitzgerald <rf@opensource.cirrus.com>2023-09-12 17:32:06 +0100
committerGreg Kroah-Hartman <gregkh@linuxfoundation.org>2023-11-28 17:19:42 +0000
commite9083128b156209d0d18e26b88adf680d069c60b (patch)
tree4cb8f907cc684b72f97cf414256a01844e924256 /sound
parent17560515ae9204a2fccc3b5c1e8a9cb3d3ca369a (diff)
downloadlinux-stable-e9083128b156209d0d18e26b88adf680d069c60b.tar.gz
linux-stable-e9083128b156209d0d18e26b88adf680d069c60b.tar.bz2
linux-stable-e9083128b156209d0d18e26b88adf680d069c60b.zip
ASoC: Intel: sof_sdw: Copy PCI SSID to struct snd_soc_card
[ Upstream commit d8b387544ff4d02eda1d1839a0c601de4b037c33 ] If the PCI SSID has been set in the struct snd_soc_acpi_mach_params, copy this to struct snd_soc_card so that it can be used by other ASoC components. This is important for components that must apply system-specific configuration. Signed-off-by: Richard Fitzgerald <rf@opensource.cirrus.com> Reviewed-by: Pierre-Louis Bossart <pierre-louis.bossart@linux.intel.com> Link: https://lore.kernel.org/r/20230912163207.3498161-4-rf@opensource.cirrus.com Signed-off-by: Mark Brown <broonie@kernel.org> Signed-off-by: Sasha Levin <sashal@kernel.org>
Diffstat (limited to 'sound')
-rw-r--r--sound/soc/intel/boards/sof_sdw.c6
1 files changed, 6 insertions, 0 deletions
diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c
index 47d22cab5af6..24e966a2ac2b 100644
--- a/sound/soc/intel/boards/sof_sdw.c
+++ b/sound/soc/intel/boards/sof_sdw.c
@@ -1934,6 +1934,12 @@ static int mc_probe(struct platform_device *pdev)
for (i = 0; i < ARRAY_SIZE(codec_info_list); i++)
codec_info_list[i].amp_num = 0;
+ if (mach->mach_params.subsystem_id_set) {
+ snd_soc_card_set_pci_ssid(card,
+ mach->mach_params.subsystem_vendor,
+ mach->mach_params.subsystem_device);
+ }
+
ret = sof_card_dai_links_create(card);
if (ret < 0)
return ret;