Received: by 2002:a05:6a10:9e8c:0:0:0:0 with SMTP id y12csp3371135pxx; Mon, 2 Nov 2020 07:13:52 -0800 (PST) X-Google-Smtp-Source: ABdhPJyrVKG37hUp0nTdOVunRQ7sVckvChScwJgeC6mtBbTJRsu1zVLEPNSUcunQDKUEGwIkzHAZ X-Received: by 2002:a05:6402:2292:: with SMTP id cw18mr17498682edb.112.1604330032394; Mon, 02 Nov 2020 07:13:52 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1604330032; cv=none; d=google.com; s=arc-20160816; b=ajih0pCec6AENZxSnRmJQMuFA/4Wba97xcvhpkN4G3Wxd9fn9hBwnITSYzIUiuV/Th nw/XIIhwLCvnmOiw1fslmoNJUxuyTvPHHZT52ww6pZ6/BJt9ICVfpKVCbaeKOk2MFtEz dqtiyHFVyKFws5xJIJyYUiecyslkcOgpzH9nZLpnHvPCEPbQovHGTw3JDd7slv7O7/5p 6BECZ8MsRPvihtSuzWq52ASEibWxG8qTWSE048c6GngrIu/WBwt4/jZuXQbjf/nWtYVh wl3fIHH50HxFDbHkaeuqyXU0dJICJniI/zAKwk8Zd+cOsOhdtCaCC94m0yc1vIQsFzbq ON5A== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:dkim-signature:mime-version:references :in-reply-to:message-id:date:subject:cc:to:from; bh=DUfSjxqgTyMLeILJTEcFS/WZ2++sn+Xe/SbNNLGn5Pg=; b=BQ1+u0JxVdRBJfFR5v6Vd4GlDVgwxSbCIqb/Vl1FZ6Wa2VI7TriuAgYLa0s+vv6zqH Y7C9pX23R4Ct1uDeNkbtdrXSAdchuwe3qFHda1Ha4xBGwj4Qm4Vx06fqY5SA6Whe6Lhm 7Pmw4Uwi1bGme2k0PbiX1aImp+zn6mHsX2oIGQZtQAL7IUNasYoHFlw1haEk5jxehclD KudVhJQsK9GSXP2qr0OKsOFl9PbOzzwuML8drrL5PK8MHPbnwDEksEnD2OI8mZ/Dfwan aMdjA+2pwwwDcgSb35qnuWa+CHBQmyRhrdNox4Ig7syYAuJYlhqeXWkCNcI+iqZPWnmn ujbg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@nvidia.com header.s=n1 header.b=VFi4twUV; 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 q4si9810155ejb.719.2020.11.02.07.13.28; Mon, 02 Nov 2020 07:13:52 -0800 (PST) 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=VFi4twUV; 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 S1726391AbgKBPLe (ORCPT + 99 others); Mon, 2 Nov 2020 10:11:34 -0500 Received: from hqnvemgate25.nvidia.com ([216.228.121.64]:4735 "EHLO hqnvemgate25.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S1726211AbgKBPLa (ORCPT ); Mon, 2 Nov 2020 10:11:30 -0500 Received: from hqmail.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate25.nvidia.com (using TLS: TLSv1.2, AES256-SHA) id ; Mon, 02 Nov 2020 07:11:31 -0800 Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL101.nvidia.com (172.20.187.10) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Mon, 2 Nov 2020 15:11:28 +0000 Received: from audio.nvidia.com (10.124.1.5) by mail.nvidia.com (172.20.187.12) with Microsoft SMTP Server id 15.0.1473.3 via Frontend Transport; Mon, 2 Nov 2020 15:11:24 +0000 From: Sameer Pujar To: , , , , , CC: , , , , , , Sameer Pujar Subject: [PATCH v5 3/7] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names Date: Mon, 2 Nov 2020 20:40:10 +0530 Message-ID: <1604329814-24779-4-git-send-email-spujar@nvidia.com> X-Mailer: git-send-email 2.7.4 In-Reply-To: <1604329814-24779-1-git-send-email-spujar@nvidia.com> References: <1604329814-24779-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=1604329891; bh=DUfSjxqgTyMLeILJTEcFS/WZ2++sn+Xe/SbNNLGn5Pg=; h=From:To:CC:Subject:Date:Message-ID:X-Mailer:In-Reply-To: References:MIME-Version:Content-Type; b=VFi4twUV18uNukhjqw/fLsDHaRtuzcifrD+UAVOkUpoA+6KwEjA8b93deQqYjM4lj dXSwYWSgXL9DCHKPxpbN+RL7vSv1mNxLwdJnefhAP/3yC7g1yll3deF9ltQPBkXRYx 402UE6ITFkG1mRNPruHAYotkn3lgnIkIRiwl2kTOk9Zc3/t9lqJ1o0ZpsqFjNzgoqq xgzraBXizRF+14TsJod6pO3jZhCrQAQJl0aTeg7HYutkIzrQgvOm+PXmfjJBiqZH4q pxInsL/6bprUUt4jXVEfnXUwm9uqvrnS+s2eH7wIXOzRijVxvVmBRki98tIlJ+eb+g FtZMMihM/uUJw== Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org For multiple instances of components, using DAI name alone for DAI links is causing conflicts. Components can define multiple DAIs and hence using just a device name won't help either. Thus DT device node reference and DAI names are used to uniquely represent DAI link names. Signed-off-by: Sameer Pujar Acked-by: Kuninori Morimoto --- sound/soc/generic/audio-graph-card.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/generic/audio-graph-card.c b/sound/soc/generic/audio-graph-card.c index 97b4f54..1e20562 100644 --- a/sound/soc/generic/audio-graph-card.c +++ b/sound/soc/generic/audio-graph-card.c @@ -253,7 +253,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, goto out_put_node; ret = asoc_simple_set_dailink_name(dev, dai_link, - "fe.%s", + "fe.%pOFP.%s", + cpus->of_node, cpus->dai_name); if (ret < 0) goto out_put_node; @@ -287,7 +288,8 @@ static int graph_dai_link_of_dpcm(struct asoc_simple_priv *priv, goto out_put_node; ret = asoc_simple_set_dailink_name(dev, dai_link, - "be.%s", + "be.%pOFP.%s", + codecs->of_node, codecs->dai_name); if (ret < 0) goto out_put_node; -- 2.7.4