Received: by 2002:a05:6902:102b:0:0:0:0 with SMTP id x11csp1116629ybt; Fri, 26 Jun 2020 21:58:49 -0700 (PDT) X-Google-Smtp-Source: ABdhPJzKrSZO9dK7ZjxIpJO6pfYPHZjg++Vd14gpPoUyGWcU8XI/pYQfF3m3PyJ1qU52x2/ENSrR X-Received: by 2002:aa7:c790:: with SMTP id n16mr7094883eds.54.1593233928890; Fri, 26 Jun 2020 21:58:48 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1593233928; cv=none; d=google.com; s=arc-20160816; b=K6RFWhr6dSZjtnEAvj4OxlXM+UcG8YspPJst+BnknlBsYRBBotmNIpkDVqKO26ta+N +IDe/ptHGYV6u/+nakzKqoiod0w1y5Cg+A1HKWNW4pfxEdlqnJkTKQfFrETi19fXffZO Emert1SzJFMOZtcdu0Q21R/5QXCnmu5aBxZvk40aPd17NRFuxDhWTX7w4b5dIrdGnM+b unyDxWWHPNLSq8tA6Dv29A8jHxpMDUu03mndNR9IvsbhZRztxIHRcNz/kmN3ZRWYnM9f aQtizTxKTIdlBiWYI8RiPc8l36aEZCGzkX/sOJ2jpizEEQF+BkdFHlFVMuarjs2iKqaH p7Xg== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:sender:dkim-signature:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=9nVgJVTRQ13S3LRBSIRSN87+sbsTgdJe0B918DkGPzY=; b=pdGLmLUWpBv+Akv7dIsvjCV+4EZP8o6GDcT4sx0AFwj0PetprAmct41kGM/7WKT7Vf 8gy+01IebEqJNwa7+evJt2rD8NkjvZQSdQM3Q1kim4GMvA21iu5k2JuwY+I8WcgKd5mf +2dW/H+nciowPjyRDgosjjfGRu3ntjc2Adied6takNNPtRhsQ1Yj465Exma4wJX6BJuT 2CRbU0seAJhN96KlADtPXfZxRJz1Ckfz8IPGInIE2EgNGfauxV2OjB95bdIaLrSDIOdk EgEIZ3aAIRhuUzbI9W1pkOl7DwdIFGf2sWabpNw+EyUEDUJwHZodNCxc86onQhKm2fy9 qK1g== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=ZSkV8WBm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Return-Path: Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18]) by mx.google.com with ESMTP id f12si5511952eje.309.2020.06.26.21.58.26; Fri, 26 Jun 2020 21:58:48 -0700 (PDT) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) client-ip=23.128.96.18; Authentication-Results: mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=ZSkV8WBm; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 23.128.96.18 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=nvidia.com Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1726408AbgF0Ez2 (ORCPT + 99 others); Sat, 27 Jun 2020 00:55:28 -0400 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:14223 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1725904AbgF0Ez1 (ORCPT ); Sat, 27 Jun 2020 00:55:27 -0400 Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA) id ; Fri, 26 Jun 2020 21:54:39 -0700 Received: from hqmail.nvidia.com ([172.20.161.6]) by hqpgpgate101.nvidia.com (PGP Universal service); Fri, 26 Jun 2020 21:55:27 -0700 X-PGP-Universal: processed; by hqpgpgate101.nvidia.com on Fri, 26 Jun 2020 21:55:27 -0700 Received: from HQMAIL101.nvidia.com (172.20.187.10) by HQMAIL109.nvidia.com (172.20.187.15) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Sat, 27 Jun 2020 04:55:26 +0000 Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend Transport; Sat, 27 Jun 2020 04:55:26 +0000 Received: from audio.nvidia.com (Not Verified[10.24.34.185]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121) id ; Fri, 26 Jun 2020 21:55:26 -0700 From: Sameer Pujar To: , , , , , CC: , , , , , , , , , , , , , , , Sameer Pujar Subject: [PATCH v4 13/23] ASoC: simple-card: DPCM DAI link direction as per DAI capability Date: Sat, 27 Jun 2020 10:23:35 +0530 Message-ID: <1593233625-14961-14-git-send-email-spujar@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1593233625-14961-1-git-send-email-spujar@nvidia.com> References: <1593233625-14961-1-git-send-email-spujar@nvidia.com> MIME-Version: 1.0 Content-Type: text/plain DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1; t=1593233679; bh=9nVgJVTRQ13S3LRBSIRSN87+sbsTgdJe0B918DkGPzY=; h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer: In-Reply-To:References:MIME-Version:Content-Type; b=ZSkV8WBmSSSZITVmXqRiFLCn/d52vJ1tE1vKAL8vgmRp/JgvKguLwEW84feQqrQnG 25jTUWrA6yZ0avTbLn2+FyWedrVqLTP5x+TCsGpGZ9U6LssHKj20GR31e2PLSGqxhg TrMJJFz+Mw62maPYLHmUvqqu3wuCofT0QqhSH05SGdQLzQW8TDvNlE6w+LaB84poIL lItzlC4ufTG+YVFnA2MacSX96lfP67cJ2b2rxxOY0mOUKESRQnlIKkmf/RwJ3qbcUG h6YyBI9KOIkQlNRTyO5VZtUlsp6/YLCSUkSgdz+1jKt0Zr3d1vM13eRtGcAsfYUo7Q zSkMavRUepwaw== Sender: linux-kernel-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org The soc_new_pcm() fails for DAI link having DAI which supports a single stream direction of either PLAYBACK or CAPTURE. For example it fails for Microphone which can support CAPTURE stream only. This happens because simple-card driver by default populates both stream directions. This can be fixed by populating directions based on DAI capability. For 'CPU<->Dummy' DAI links CPU is used to setup the direction and similarly Codec is used for 'Dummy<->Codec' DAI links. Signed-off-by: Sameer Pujar --- sound/soc/generic/simple-card.c | 27 +++++++++++++++++++++++++-- sound/soc/soc-dai.c | 1 + 2 files changed, 26 insertions(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card.c b/sound/soc/generic/simple-card.c index 15c4388..62f2978 100644 --- a/sound/soc/generic/simple-card.c +++ b/sound/soc/generic/simple-card.c @@ -114,6 +114,23 @@ static void simple_parse_mclk_fs(struct device_node *top, of_node_put(node); } +static int simple_parse_dpcm_dir(const struct snd_soc_dai_link_component *dlc, + struct snd_soc_dai_link *dai_link) +{ + struct snd_soc_dai *dai = snd_soc_find_dai(dlc); + + if (!dai) + return -EINVAL; + + dai_link->dpcm_playback = + snd_soc_dai_stream_valid(dai, SNDRV_PCM_STREAM_PLAYBACK); + + dai_link->dpcm_capture = + snd_soc_dai_stream_valid(dai, SNDRV_PCM_STREAM_CAPTURE); + + return 0; +} + static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, struct device_node *np, struct link_info *li, @@ -183,6 +200,10 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, goto out_put_node; asoc_simple_canonicalize_cpu(dai_link, is_single_links); + + ret = simple_parse_dpcm_dir(cpus, dai_link); + if (ret < 0) + goto out_put_node; } else { struct snd_soc_codec_conf *cconf; @@ -223,6 +244,10 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, "prefix"); snd_soc_of_parse_node_prefix(np, cconf, codecs->of_node, "prefix"); + + ret = simple_parse_dpcm_dir(codecs, dai_link); + if (ret < 0) + goto out_put_node; } simple_parse_convert(dev, np, &dai_props->adata); @@ -239,8 +264,6 @@ static int simple_dai_link_of_dpcm(struct asoc_simple_priv *priv, if (ret < 0) goto out_put_node; - dai_link->dpcm_playback = 1; - dai_link->dpcm_capture = 1; dai_link->ops = &simple_ops; dai_link->init = asoc_simple_dai_init; diff --git a/sound/soc/soc-dai.c b/sound/soc/soc-dai.c index b05e18b..bd4465f 100644 --- a/sound/soc/soc-dai.c +++ b/sound/soc/soc-dai.c @@ -390,6 +390,7 @@ bool snd_soc_dai_stream_valid(struct snd_soc_dai *dai, int dir) /* If the codec specifies any channels at all, it supports the stream */ return stream->channels_min; } +EXPORT_SYMBOL_GPL(snd_soc_dai_stream_valid); void snd_soc_dai_action(struct snd_soc_dai *dai, int stream, int action) -- 2.7.4