public inbox for linux-kernel@vger.kernel.org
 help / color / mirror / Atom feed
From: Sasha Levin <sashal@kernel.org>
To: linux-kernel@vger.kernel.org, stable@vger.kernel.org
Cc: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>,
	Mark Brown <broonie@kernel.org>, Sasha Levin <sashal@kernel.org>,
	lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com,
	Syed.SabaKareem@amd.com, alpernebiyasak@gmail.com,
	cristian.ciocaltea@collabora.com,
	kuninori.morimoto.gx@renesas.com, posteuca@mutex.one,
	linux-sound@vger.kernel.org
Subject: [PATCH AUTOSEL 6.7 06/44] ASoC: amd: acp: Add check for cpu dai link initialization
Date: Wed,  7 Feb 2024 16:20:33 -0500	[thread overview]
Message-ID: <20240207212142.1399-6-sashal@kernel.org> (raw)
In-Reply-To: <20240207212142.1399-1-sashal@kernel.org>

From: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>

[ Upstream commit 6cc2aa9a75f2397d42b78d4c159bc06722183c78 ]

Add condition check for cpu dai link initialization for amplifier
codec path, as same pcm id uses for both headset and speaker path
for RENOIR platforms.

Signed-off-by: Venkata Prasad Potturu <venkataprasad.potturu@amd.com>
Link: https://msgid.link/r/20240118143023.1903984-3-venkataprasad.potturu@amd.com
Signed-off-by: Mark Brown <broonie@kernel.org>
Signed-off-by: Sasha Levin <sashal@kernel.org>
---
 sound/soc/amd/acp/acp-mach-common.c | 9 +++++++--
 1 file changed, 7 insertions(+), 2 deletions(-)

diff --git a/sound/soc/amd/acp/acp-mach-common.c b/sound/soc/amd/acp/acp-mach-common.c
index 34b14f2611ba..12ff0a558ea8 100644
--- a/sound/soc/amd/acp/acp-mach-common.c
+++ b/sound/soc/amd/acp/acp-mach-common.c
@@ -1428,8 +1428,13 @@ int acp_sofdsp_dai_links_create(struct snd_soc_card *card)
 	if (drv_data->amp_cpu_id == I2S_SP) {
 		links[i].name = "acp-amp-codec";
 		links[i].id = AMP_BE_ID;
-		links[i].cpus = sof_sp_virtual;
-		links[i].num_cpus = ARRAY_SIZE(sof_sp_virtual);
+		if (drv_data->platform == RENOIR) {
+			links[i].cpus = sof_sp;
+			links[i].num_cpus = ARRAY_SIZE(sof_sp);
+		} else {
+			links[i].cpus = sof_sp_virtual;
+			links[i].num_cpus = ARRAY_SIZE(sof_sp_virtual);
+		}
 		links[i].platforms = sof_component;
 		links[i].num_platforms = ARRAY_SIZE(sof_component);
 		links[i].dpcm_playback = 1;
-- 
2.43.0


  parent reply	other threads:[~2024-02-07 21:21 UTC|newest]

Thread overview: 46+ messages / expand[flat|nested]  mbox.gz  Atom feed  top
2024-02-07 21:20 [PATCH AUTOSEL 6.7 01/44] ext4: avoid dividing by 0 in mb_update_avg_fragment_size() when block bitmap corrupt Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 02/44] ext4: avoid allocating blocks from corrupted group in ext4_mb_try_best_found() Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 03/44] ext4: avoid allocating blocks from corrupted group in ext4_mb_find_by_goal() Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 04/44] Input: goodix - accept ACPI resources with gpio_count == 3 && gpio_int_idx == 0 Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 05/44] dmaengine: ti: edma: Add some null pointer checks to the edma_probe Sasha Levin
2024-02-07 21:20 ` Sasha Levin [this message]
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 07/44] ASoC: codecs: wcd934x: drop unneeded regulator include Sasha Levin
2024-02-08 11:37   ` Mark Brown
2024-02-22 12:29     ` Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 08/44] regulator: pwm-regulator: Add validity checks in continuous .get_voltage Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 09/44] HID: logitech-hidpp: add support for Logitech G Pro X Superlight 2 Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 10/44] ALSA: hda: Replace numeric device IDs with constant values Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 11/44] ALSA: hda: Increase default bdl_pos_adj for Apollo Lake Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 12/44] HID: nvidia-shield: Add missing null pointer checks to LED initialization Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 13/44] nvmet-tcp: fix nvme tcp ida memory leak Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 14/44] usb: ucsi_acpi: Quirk to ack a connector change ack cmd Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 15/44] ALSA: usb-audio: Check presence of valid altsetting control Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 16/44] ASoC: sunxi: sun4i-spdif: Add support for Allwinner H616 Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 17/44] ALSA: hda: cs35l41: Support additional ASUS Zenbook UX3402VA Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 18/44] ALSA: hda: cs35l41: Support ASUS Zenbook UM3402YAR Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 19/44] regulator (max5970): Fix IRQ handler Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 20/44] spi: sh-msiof: avoid integer overflow in constants Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 21/44] Input: xpad - add Lenovo Legion Go controllers Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 22/44] misc: open-dice: Fix spurious lockdep warning Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 23/44] netfilter: conntrack: check SCTP_CID_SHUTDOWN_ACK for vtag setting in sctp_new Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 24/44] drm/amdkfd: Use correct drm device for cgroup permission check Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 25/44] drm/amd/display: increased min_dcfclk_mhz and min_fclk_mhz Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 26/44] drm/amd/display: fix USB-C flag update after enc10 feature init Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 27/44] drm/amd/display: Fix DPSTREAM CLK on and off sequence Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 28/44] cifs: make sure that channel scaling is done only once Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 29/44] ASoC: wm_adsp: Don't overwrite fwf_name with the default Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 30/44] ALSA: usb-audio: Ignore clock selector errors for single connection Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 31/44] nvme-fc: do not wait in vain when unloading module Sasha Levin
2024-02-07 21:20 ` [PATCH AUTOSEL 6.7 32/44] nvmet-fcloop: swap the list_add_tail arguments Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 33/44] nvmet-fc: release reference on target port Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 34/44] nvmet-fc: defer cleanup using RCU properly Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 35/44] nvmet-fc: free queue and assoc directly Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 36/44] nvmet-fc: hold reference on hostport match Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 37/44] nvmet-fc: do not tack refs on tgtports from assoc Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 38/44] nvmet-fc: abort command when there is no binding Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 39/44] nvmet-fc: avoid deadlock on delete association path Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 40/44] nvmet-fc: take ref count on tgtport before delete assoc Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 41/44] cifs: do not search for channel if server is terminating Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 42/44] smb: client: increase number of PDUs allowed in a compound request Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 43/44] ext4: correct the hole length returned by ext4_map_blocks() Sasha Levin
2024-02-07 21:21 ` [PATCH AUTOSEL 6.7 44/44] Input: i8042 - add Fujitsu Lifebook U728 to i8042 quirk table Sasha Levin

Reply instructions:

You may reply publicly to this message via plain-text email
using any one of the following methods:

* Save the following mbox file, import it into your mail client,
  and reply-to-all from there: mbox

  Avoid top-posting and favor interleaved quoting:
  https://en.wikipedia.org/wiki/Posting_style#Interleaved_style

* Reply using the --to, --cc, and --in-reply-to
  switches of git-send-email(1):

  git send-email \
    --in-reply-to=20240207212142.1399-6-sashal@kernel.org \
    --to=sashal@kernel.org \
    --cc=Syed.SabaKareem@amd.com \
    --cc=alpernebiyasak@gmail.com \
    --cc=broonie@kernel.org \
    --cc=cristian.ciocaltea@collabora.com \
    --cc=kuninori.morimoto.gx@renesas.com \
    --cc=lgirdwood@gmail.com \
    --cc=linux-kernel@vger.kernel.org \
    --cc=linux-sound@vger.kernel.org \
    --cc=perex@perex.cz \
    --cc=posteuca@mutex.one \
    --cc=stable@vger.kernel.org \
    --cc=tiwai@suse.com \
    --cc=venkataprasad.potturu@amd.com \
    /path/to/YOUR_REPLY

  https://kernel.org/pub/software/scm/git/docs/git-send-email.html

* If your mail client supports setting the In-Reply-To header
  via mailto: links, try the mailto: link
Be sure your reply has a Subject: header at the top and a blank line before the message body.
This is a public inbox, see mirroring instructions
for how to clone and mirror all data and code used for this inbox