From mboxrd@z Thu Jan 1 00:00:00 1970 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 3DF84C4167D for ; Tue, 7 Nov 2023 15:48:25 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 6C168741; Tue, 7 Nov 2023 16:47:33 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 6C168741 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1699372103; bh=GTRXkb/PnBZm51qM3/nPCGsJZs0Ktvf0gOa0EAAkkg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=OHKq+epEwN7tOHffEE0+Qwea5JFk/5w9ABvT+YaBpW/Dplbn1YhuAf2u6hmHGOZ4e zzcTjgjKrgDMyKtERQBoRfIeugUdgXoaqYXH/8wtpnHxSwyh0UCGvXpNjrXh5jxlhA q07rT4/cMxiO6zc42cR2Hz0YKURkVQjebaeDCFQk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 83412F80564; Tue, 7 Nov 2023 16:47:17 +0100 (CET) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id 12085F80557; Tue, 7 Nov 2023 16:47:17 +0100 (CET) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 7F160F801F5; Tue, 7 Nov 2023 16:47:13 +0100 (CET) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id F2C63F800ED for ; Tue, 7 Nov 2023 16:47:08 +0100 (CET) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz F2C63F800ED Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=OHTKYH6j Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by dfw.source.kernel.org (Postfix) with ESMTP id 4CAD6611C8; Tue, 7 Nov 2023 15:47:06 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id 17736C433C7; Tue, 7 Nov 2023 15:47:03 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1699372025; bh=GTRXkb/PnBZm51qM3/nPCGsJZs0Ktvf0gOa0EAAkkg8=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OHTKYH6jtBAUcBGrsgNxboo/zQELQ6gIRIQF5xzqg+DkGPUFy1ZmUHC2rFpAh4gsE 7qAECDf069svzf+j4e9oLTV6lVnV/Ly+TJZYS+ESboXxS4kG5wdDHchsmXHPshxiuW vheS1ReM69x3RK5xgAu0hprrDDB+WVaylC77JQA4Yo0+qfBWtgcFobKbpAvuPisiqG t/7t4MKHWpdEVm9F3MxrxTzxgaEYW3JAIwZHSjXhK0vr46B9eJDFTppcepWQeYQoBv LOiaOwNhmQ3lMMeTA/ZD0qa7uS974Cop/RBm6DBRZr7pXBctGqxEMVXOBo7dzbiF2t jlO8f3+0cEcQA== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Richard Fitzgerald , Pierre-Louis Bossart , Mark Brown , Sasha Levin , cezary.rojewski@intel.com, liam.r.girdwood@linux.intel.com, peter.ujfalusi@linux.intel.com, yung-chuan.liao@linux.intel.com, ranjani.sridharan@linux.intel.com, kai.vehmanen@linux.intel.com, perex@perex.cz, tiwai@suse.com, ckeepax@opensource.cirrus.com, gongjun.song@intel.com, uday.m.bhat@intel.com, alsa-devel@alsa-project.org, linux-sound@vger.kernel.org Subject: [PATCH AUTOSEL 6.6 04/36] ASoC: Intel: sof_sdw: Copy PCI SSID to struct snd_soc_card Date: Tue, 7 Nov 2023 10:45:46 -0500 Message-ID: <20231107154654.3765336-4-sashal@kernel.org> X-Mailer: git-send-email 2.42.0 In-Reply-To: <20231107154654.3765336-1-sashal@kernel.org> References: <20231107154654.3765336-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.6 Content-Transfer-Encoding: 8bit Message-ID-Hash: EFRITCISFYUZOYX6B6URUOAY4EQGJ4NW X-Message-ID-Hash: EFRITCISFYUZOYX6B6URUOAY4EQGJ4NW X-MailFrom: sashal@kernel.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: From: Richard Fitzgerald [ 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 Reviewed-by: Pierre-Louis Bossart Link: https://lore.kernel.org/r/20230912163207.3498161-4-rf@opensource.cirrus.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/intel/boards/sof_sdw.c | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/sound/soc/intel/boards/sof_sdw.c b/sound/soc/intel/boards/sof_sdw.c index 842649501e303..44f583e971e65 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; -- 2.42.0