Received: by 2002:a25:e74b:0:0:0:0:0 with SMTP id e72csp787953ybh;
        Sat, 18 Jul 2020 22:11:23 -0700 (PDT)
X-Google-Smtp-Source: ABdhPJz2Jaydw4BbXu6GILtlYk+WI5CFHd60YZ9L9u8qyMgDlkCfHH6EmlOCRiAwo8pMsj6ziICd
X-Received: by 2002:a17:906:e25a:: with SMTP id gq26mr14998868ejb.152.1595135483552;
        Sat, 18 Jul 2020 22:11:23 -0700 (PDT)
ARC-Seal: i=1; a=rsa-sha256; t=1595135483; cv=none;
        d=google.com; s=arc-20160816;
        b=lNwi5hXIaGQErtM6eAp/fhG71+CDwKrQl8H/iIR4sFjmhLLhpcbHIfNwnYx32pe+NL
         XxeTDEx+6Gen9dJyEXwvsyX13oY8MV5R83LAPS1WypzWy5AWrwL4N3LMEXT58cXLoVDj
         VyDMVXzTOVmpsUk9TSDrRbD4CNd+KvmKwB6Up0zmReDAg8OeiSH3loxkR4laXB8G/Xvo
         UpgCUQjGz8ELmabyF5VoOSCSdVQr9bzw1xSks5aGWMkVxNRPb2NqLaPxq9ipiMEpzIsH
         xjhJIzsKISFFYKRaFV8Exgs9CiUnnOpeLsqRugwrcqu5fEtGqrfekhDwd4j2CuaHwc+c
         wdFQ==
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=VCqQyFvsC42bD01qDtx7VomZ3rPYcT/ToygIVRhfO88=;
        b=iJFkUm7+UQvqGeacdwcZ52hipwxDmk1RHKg+IdMkniBUfJotgfV5W5NRg0IxnJqihA
         hV5ugdm1azrKoj8g/iy9xwoXv0rpNNqj0NKFeJKQ7uyOWla9wBGsI7ro1po+2GElXuTk
         TXYhjsAjPCcaPotSAKv/VpQfTZQgLB6QZ6oY06N+LWVLnjM7LJBXZ/gpmvoetfMp1NPd
         IDlJjTAvdi82HCvau6Nxms7zx0xjrGDOEr3riv6w9YCTkzONQRCuWxiM9RCx2dURd6+O
         BUAnxp+cEyyUb+puLmOa3tCMFUIzYBYSD/uYLuWq5xumjMQyOXAPk38/uJPA4XaG1aB8
         givg==
ARC-Authentication-Results: i=1; mx.google.com;
       dkim=pass header.i=@nvidia.com header.s=n1 header.b=IJTgaVQw;
       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: <linux-kernel-owner@vger.kernel.org>
Received: from vger.kernel.org (vger.kernel.org. [23.128.96.18])
        by mx.google.com with ESMTP id by9si8186412edb.212.2020.07.18.22.11.01;
        Sat, 18 Jul 2020 22:11:23 -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=IJTgaVQw;
       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 S1726177AbgGSFKt (ORCPT <rfc822;tanxianhu@gmail.com> + 99 others);
        Sun, 19 Jul 2020 01:10:49 -0400
Received: from hqnvemgate26.nvidia.com ([216.228.121.65]:18187 "EHLO
        hqnvemgate26.nvidia.com" rhost-flags-OK-OK-OK-OK) by vger.kernel.org
        with ESMTP id S1725272AbgGSFKs (ORCPT
        <rfc822;linux-kernel@vger.kernel.org>);
        Sun, 19 Jul 2020 01:10:48 -0400
Received: from hqpgpgate101.nvidia.com (Not Verified[216.228.121.13]) by hqnvemgate26.nvidia.com (using TLS: TLSv1.2, DES-CBC3-SHA)
        id <B5f13d5cc0000>; Sat, 18 Jul 2020 22:10:36 -0700
Received: from hqmail.nvidia.com ([172.20.161.6])
  by hqpgpgate101.nvidia.com (PGP Universal service);
  Sat, 18 Jul 2020 22:10:48 -0700
X-PGP-Universal: processed;
        by hqpgpgate101.nvidia.com on Sat, 18 Jul 2020 22:10:48 -0700
Received: from HQMAIL105.nvidia.com (172.20.187.12) by HQMAIL107.nvidia.com
 (172.20.187.13) with Microsoft SMTP Server (TLS) id 15.0.1473.3; Sun, 19 Jul
 2020 05:10:48 +0000
Received: from hqnvemgw03.nvidia.com (10.124.88.68) by HQMAIL105.nvidia.com
 (172.20.187.12) with Microsoft SMTP Server (TLS) id 15.0.1473.3 via Frontend
 Transport; Sun, 19 Jul 2020 05:10:48 +0000
Received: from audio.nvidia.com (Not Verified[10.24.34.185]) by hqnvemgw03.nvidia.com with Trustwave SEG (v7,5,8,10121)
        id <B5f13d5d30000>; Sat, 18 Jul 2020 22:10:47 -0700
From:   Sameer Pujar <spujar@nvidia.com>
To:     <broonie@kernel.org>, <perex@perex.cz>, <tiwai@suse.com>,
        <kuninori.morimoto.gx@renesas.com>, <robh+dt@kernel.org>,
        <lgirdwood@gmail.com>
CC:     <thierry.reding@gmail.com>, <jonathanh@nvidia.com>,
        <alsa-devel@alsa-project.org>, <linux-tegra@vger.kernel.org>,
        <linux-kernel@vger.kernel.org>, <sharadg@nvidia.com>,
        <mkumard@nvidia.com>, <viswanathl@nvidia.com>,
        <rlokhande@nvidia.com>, <dramesh@nvidia.com>,
        <atalambedu@nvidia.com>, <nwartikar@nvidia.com>,
        <swarren@nvidia.com>, <nicoleotsuka@gmail.com>,
        Sameer Pujar <spujar@nvidia.com>
Subject: [PATCH 02/10] ASoC: audio-graph: Use of_node and DAI for DPCM DAI link names
Date:   Sun, 19 Jul 2020 10:40:09 +0530
Message-ID: <1595135417-16589-3-git-send-email-spujar@nvidia.com>
X-Mailer: git-send-email 2.7.4
In-Reply-To: <1595135417-16589-1-git-send-email-spujar@nvidia.com>
References: <1595135417-16589-1-git-send-email-spujar@nvidia.com>
X-NVConfidentiality: public
MIME-Version: 1.0
Content-Type: text/plain
DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=nvidia.com; s=n1;
        t=1595135436; bh=VCqQyFvsC42bD01qDtx7VomZ3rPYcT/ToygIVRhfO88=;
        h=X-PGP-Universal:From:To:CC:Subject:Date:Message-ID:X-Mailer:
         In-Reply-To:References:X-NVConfidentiality:MIME-Version:
         Content-Type;
        b=IJTgaVQw5bFtkhvnekZZfHhEYGzVlXuimVGna6X1ObsCKAiSwisB4VgULC1Kpr6L4
         gLvfnSjHs4Wpsu/w2xpVb1DNhJ4bSnAqJUzuiZ9vic3ArYJxEFB94KWvMPeorUYH9K
         OZRKscxqyiJWkaSvOuEaVsJHbabBM36wk2xmHChEnVt0BZTiHzpeSG8wTG1Ezyrn7S
         A08QMAaXVDRbVtC+1mydFLyVFjZctGRIS98Y0Sqf81aDAqAn5vFOkRLFpFxev1Gtya
         Wz9jUuQJQBshw25Y/kh6rquMsQaG/hEwplyWJOrxYR/np5v3vBV2GmvvFSf398izWv
         v2mufBgnCc81g==
Sender: linux-kernel-owner@vger.kernel.org
Precedence: bulk
List-ID: <linux-kernel.vger.kernel.org>
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 <spujar@nvidia.com>
---
 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