Received: by 2002:a05:7412:a9a3:b0:f9:327e:43ab with SMTP id o35csp66923rdh; Mon, 18 Dec 2023 04:43:36 -0800 (PST) X-Google-Smtp-Source: AGHT+IHuv/W8mcHj7Z+8G/enx2j/PqFzJwxEQkuXBsxAbiubZw+uKNdfMw7qx1VszdPr+VO2fTy3 X-Received: by 2002:a05:6402:902:b0:54c:d1b1:d634 with SMTP id g2-20020a056402090200b0054cd1b1d634mr16408406edz.39.1702903416078; Mon, 18 Dec 2023 04:43:36 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1702903416; cv=none; d=google.com; s=arc-20160816; b=X/m85diCQN53TxsvfRvFFZnAp7TQ2a9PdB3MiJ7yVm9WZvF5Ud+MKkAyOMo4UqrBuE EijaHwJ8HDMFBdhRekI9ZpfahXEnWAzbB7lyNTql5/7GC1l/hBAxZf659kIzd254wIcR +Zx3F7VEMfLby9lMcAPzKDPeNXVR7kl4pcETDhHsvYU5A97suIic2FOYNtZyKRzfbZ5M 67Wrgv1L/nsIB6V6FLML+fYs2rNooBvUJHIV91y20v5v746MugtoiSoWov+QBbtf+9xs SCUO5ONe4pglEmpGmQFJ6TE2rUGyWVLTEUQZzje96DoNaZUvjypGtSJdtLS7vbUFxfV/ JH7g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=content-transfer-encoding:mime-version:list-unsubscribe :list-subscribe:list-id:precedence:references:in-reply-to:message-id :date:subject:cc:to:from:dkim-signature:dkim-filter; bh=Zuye7VoRd0C6JZdYDMaGdcEQy180udrCmVx/gGdxW00=; fh=tQDBYMLxw9pGRS61bl22/5Nh3Impw3/NQWSQ0aEjqug=; b=pHdsZsg3q+Og656Q5Ax09DZhZ23dL7JbfuMuNaPUEzpC3Ml4qRb7fvv9bJJbGfxqqy LR47INtKdJx7Ru9TB3jyOgf9WVaGP/ya0CEuzOnjKx9c3kqrZ+kGxHWzmZhZweeh9Cvp KwX1TfpjcRfaGOZxDEDwW7fcGvMZeTDAWYufSI8hkoymNJHpGmqArRxK4WPo0ksFh/Dz wIreyg57BxH3ErgEJk2rghIpYT2xIanzUojR1p0kWE33yKP1JULZYCkkHy+vF0Av3h9H kT+gGXsBoQsRqm5wz+pq+6Qog6qcLFg4ywqeYRyzILRSeJC1eTLJvwcLOBldQh5vfyXi rL9w== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b="w7x29+/3"; spf=pass (google.com: domain of linux-kernel+bounces-3590-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3590-linux.lists.archive=gmail.com@vger.kernel.org" Return-Path: Received: from am.mirrors.kernel.org (am.mirrors.kernel.org. [2604:1380:4601:e00::3]) by mx.google.com with ESMTPS id f4-20020a50d544000000b00551f91a5683si5067935edj.541.2023.12.18.04.43.36 for (version=TLS1_3 cipher=TLS_AES_256_GCM_SHA384 bits=256/256); Mon, 18 Dec 2023 04:43:36 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel+bounces-3590-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) client-ip=2604:1380:4601:e00::3; Authentication-Results: mx.google.com; dkim=pass header.i=@savoirfairelinux.com header.s=DFC430D2-D198-11EC-948E-34200CB392D2 header.b="w7x29+/3"; spf=pass (google.com: domain of linux-kernel+bounces-3590-linux.lists.archive=gmail.com@vger.kernel.org designates 2604:1380:4601:e00::3 as permitted sender) smtp.mailfrom="linux-kernel+bounces-3590-linux.lists.archive=gmail.com@vger.kernel.org" Received: from smtp.subspace.kernel.org (wormhole.subspace.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by am.mirrors.kernel.org (Postfix) with ESMTPS id C03691F22789 for ; Mon, 18 Dec 2023 12:43:35 +0000 (UTC) Received: from localhost.localdomain (localhost.localdomain [127.0.0.1]) by smtp.subspace.kernel.org (Postfix) with ESMTP id 4DE717FBCA; Mon, 18 Dec 2023 12:42:52 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dkim=pass (2048-bit key) header.d=savoirfairelinux.com header.i=@savoirfairelinux.com header.b="w7x29+/3" X-Original-To: linux-kernel@vger.kernel.org Received: from mail.savoirfairelinux.com (mail.savoirfairelinux.com [208.88.110.44]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.subspace.kernel.org (Postfix) with ESMTPS id AA4F37D61B; Mon, 18 Dec 2023 12:42:49 +0000 (UTC) Authentication-Results: smtp.subspace.kernel.org; dmarc=none (p=none dis=none) header.from=savoirfairelinux.com Authentication-Results: smtp.subspace.kernel.org; spf=pass smtp.mailfrom=savoirfairelinux.com Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 9D7279C3D87; Mon, 18 Dec 2023 07:42:48 -0500 (EST) Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10032) with ESMTP id c0ZHxLiwu2J5; Mon, 18 Dec 2023 07:42:48 -0500 (EST) Received: from localhost (localhost [127.0.0.1]) by mail.savoirfairelinux.com (Postfix) with ESMTP id 41A239C3F1C; Mon, 18 Dec 2023 07:42:48 -0500 (EST) DKIM-Filter: OpenDKIM Filter v2.10.3 mail.savoirfairelinux.com 41A239C3F1C DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=savoirfairelinux.com; s=DFC430D2-D198-11EC-948E-34200CB392D2; t=1702903368; bh=Zuye7VoRd0C6JZdYDMaGdcEQy180udrCmVx/gGdxW00=; h=From:To:Date:Message-Id:MIME-Version; b=w7x29+/3ECcYY0aUWQefzGrb8l1Xt6PcaEhsgkcr/jZMIUWTo+gXekAUxZLWzJpCs Aimw6iBZVELs2H2GzHQ/tDU62IIeVVyH5vXJfFlTD50aTmF5N1+g8o4Dem8INLaTFh 0n96DW9s1Bxabs/y6wO3YGCLwY2wPpVR2X7YppwPpl+YFw17nTH0ChpN09AYw9Lg8U 3V3aL8wBxyca1IKUzVLVISVhz0HejsF7KcGpwOuqoxSvnZ4IKNelchPFWRgA4HVvBk 9tiPjkvDugxBP1ZGMKdCfs7SeBXl7AB3LKloIuGigedR5fVUbYROek7cLYX119q68g dumlwNjQynXyQ== X-Virus-Scanned: amavis at mail.savoirfairelinux.com Received: from mail.savoirfairelinux.com ([127.0.0.1]) by localhost (mail.savoirfairelinux.com [127.0.0.1]) (amavis, port 10026) with ESMTP id TLSXHTjA3oSl; Mon, 18 Dec 2023 07:42:48 -0500 (EST) Received: from gerard.rennes.sfl (unknown [192.168.216.3]) by mail.savoirfairelinux.com (Postfix) with ESMTPSA id 3E4109C3D87; Mon, 18 Dec 2023 07:42:46 -0500 (EST) From: Elinor Montmasson To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Shengjiu Wang , Xiubo Li , Fabio Estevam , Nicolin Chen , Jaroslav Kysela , Takashi Iwai Cc: linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, alsa-devel@alsa-project.org, linuxppc-dev@lists.ozlabs.org, Elinor Montmasson , Philip-Dylan Subject: [PATCHv3 RESEND 02/10] ASoC: fsl-asoc-card: add second dai link component for codecs Date: Mon, 18 Dec 2023 13:40:50 +0100 Message-Id: <20231218124058.2047167-3-elinor.montmasson@savoirfairelinux.com> X-Mailer: git-send-email 2.25.1 In-Reply-To: <20231218124058.2047167-1-elinor.montmasson@savoirfairelinux.com> References: <20231218124058.2047167-1-elinor.montmasson@savoirfairelinux.com> Precedence: bulk X-Mailing-List: linux-kernel@vger.kernel.org List-Id: List-Subscribe: List-Unsubscribe: MIME-Version: 1.0 Content-Transfer-Encoding: quoted-printable Add a second dai link component for codecs that will be used for the generic codec use case. It will use spdif_receiver and spdif_transmitter drivers as dummy codec drivers, needing 2 codecs slots for the links. To prevent deferring in use cases using only one codec, also set by default the number of codecs to 1 for the relevant dai links. Signed-off-by: Elinor Montmasson Co-authored-by: Philip-Dylan Gleonec --- sound/soc/fsl/fsl-asoc-card.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/fsl/fsl-asoc-card.c b/sound/soc/fsl/fsl-asoc-card.= c index cde31fd38262..a62f26fe9802 100644 --- a/sound/soc/fsl/fsl-asoc-card.c +++ b/sound/soc/fsl/fsl-asoc-card.c @@ -295,7 +295,7 @@ static int be_hw_params_fixup(struct snd_soc_pcm_runt= ime *rtd, =20 SND_SOC_DAILINK_DEFS(hifi, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_EMPTY())); =20 SND_SOC_DAILINK_DEFS(hifi_fe, @@ -305,7 +305,7 @@ SND_SOC_DAILINK_DEFS(hifi_fe, =20 SND_SOC_DAILINK_DEFS(hifi_be, DAILINK_COMP_ARRAY(COMP_EMPTY()), - DAILINK_COMP_ARRAY(COMP_EMPTY()), + DAILINK_COMP_ARRAY(COMP_EMPTY(), COMP_EMPTY()), DAILINK_COMP_ARRAY(COMP_DUMMY())); =20 static const struct snd_soc_dai_link fsl_asoc_card_dai[] =3D { @@ -618,6 +618,8 @@ static int fsl_asoc_card_probe(struct platform_device= *pdev) =20 memcpy(priv->dai_link, fsl_asoc_card_dai, sizeof(struct snd_soc_dai_link) * ARRAY_SIZE(priv->dai_link)); + priv->dai_link[0].num_codecs =3D 1; + priv->dai_link[2].num_codecs =3D 1; =20 priv->card.dapm_routes =3D audio_map; priv->card.num_dapm_routes =3D ARRAY_SIZE(audio_map); --=20 2.25.1