From patchwork Fri Mar 13 01:22:34 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6000871 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id 3231B9F318 for ; Fri, 13 Mar 2015 01:25:09 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 588C92034F for ; Fri, 13 Mar 2015 01:25:08 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 2A25A2034A for ; Fri, 13 Mar 2015 01:25:07 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 00DF6260537; Fri, 13 Mar 2015 02:25:06 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 4CBC626043A; Fri, 13 Mar 2015 02:23:59 +0100 (CET) X-Original-To: alsa-devel@alsa-project.org Delivered-To: alsa-devel@alsa-project.org Received: by alsa0.perex.cz (Postfix, from userid 1000) id F0B43260444; Fri, 13 Mar 2015 02:23:57 +0100 (CET) Received: from relmlie1.idc.renesas.com (relmlor2.renesas.com [210.160.252.172]) by alsa0.perex.cz (Postfix) with ESMTP id C6AE0260430 for ; Fri, 13 Mar 2015 02:22:38 +0100 (CET) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie1.idc.renesas.com with ESMTP; 13 Mar 2015 10:22:37 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 474614320A; Fri, 13 Mar 2015 10:22:37 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 3BF768002D; Fri, 13 Mar 2015 10:22:37 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 274098002F; Fri, 13 Mar 2015 10:22:37 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id LAU05210; Fri, 13 Mar 2015 10:22:37 +0900 X-IronPort-AV: E=Sophos;i="5.11,391,1422889200"; d="scan'208";a="182974765" Received: from mail-hk1lp0117.outbound.protection.outlook.com (HELO APAC01-HK1-obe.outbound.protection.outlook.com) ([207.46.51.117]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 13 Mar 2015 10:22:36 +0900 Received: from morimoto-PC.renesas.com (211.11.155.132) by SINPR06MB315.apcprd06.prod.outlook.com (10.141.115.153) with Microsoft SMTP Server (TLS) id 15.1.112.16; Fri, 13 Mar 2015 01:22:34 +0000 Message-ID: <87wq2lr8s8.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown In-Reply-To: <874mppsngc.wl%kuninori.morimoto.gx@renesas.com> References: <874mppsngc.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 13 Mar 2015 01:22:34 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: OS2PR01CA0020.jpnprd01.prod.outlook.com (25.161.74.158) To SINPR06MB315.apcprd06.prod.outlook.com (10.141.115.153) Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:SINPR06MB315; X-Forefront-Antispam-Report: BMV:1; SFV:NSPM; SFS:(10019020)(6009001)(77096005)(86362001)(122386002)(77156002)(19580405001)(62966003)(19580395003)(50466002)(23726002)(42186005)(2950100001)(83506001)(76176999)(50986999)(54356999)(92566002)(46102003)(40100003)(53416004)(33646002)(110136001)(46406003)(229853001)(36756003)(87976001)(66066001)(47776003); DIR:OUT; SFP:1102; SCL:1; SRVR:SINPR06MB315; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(5002009)(5005006); SRVR:SINPR06MB315; BCL:0; PCL:0; RULEID:; SRVR:SINPR06MB315; X-Forefront-PRVS: 05143A8241 X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 13 Mar 2015 01:22:34.7059 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SINPR06MB315 Cc: Linux-ALSA , Simon , shiiba , Liam Girdwood , Das Biju Subject: [alsa-devel] [PATCH 04/13] ASoC: dapm: add driver prefix matching for snd_soc_dapm_add_route() X-BeenThere: alsa-devel@alsa-project.org X-Mailman-Version: 2.1.14 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current DAPM will lost correct route settings if some CPU/Codec was using same stream name, and it will be problem when DPCM case. For example, stream name of Renesas sound drver / ak4642 / dummy for DPCM have same name as "Playback", like below FE CPU (rsnd): "DAI0 Playback" Codec (dummy): "Playback" BE CPU (dummy): "Playback" Codec (ak4642): "Playback" Then, "Playback" - "DAI0 Playback" can't match correctly. This patch adds "driver name" prefix for this case. We can use "ak4642-hifi Playback" - "DAI0 Playback" here. Signed-off-by: Kuninori Morimoto --- sound/soc/soc-dapm.c | 13 +++++++++++++ 1 file changed, 13 insertions(+) diff --git a/sound/soc/soc-dapm.c b/sound/soc/soc-dapm.c index d4b331d..722b922 100644 --- a/sound/soc/soc-dapm.c +++ b/sound/soc/soc-dapm.c @@ -2417,10 +2417,12 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, { struct snd_soc_dapm_widget *wsource = NULL, *wsink = NULL, *w; struct snd_soc_dapm_widget *wtsource = NULL, *wtsink = NULL; + struct snd_soc_dai *w_dai; const char *sink; const char *source; char prefixed_sink[80]; char prefixed_source[80]; + char _w_name[80], *w_name; const char *prefix; int ret; @@ -2442,6 +2444,17 @@ static int snd_soc_dapm_add_route(struct snd_soc_dapm_context *dapm, * current DAPM context */ list_for_each_entry(w, &dapm->card->widgets, list) { + w_dai = w->priv; + w_name = NULL; + if (w_dai) { + snprintf(_w_name, sizeof(_w_name), "%s %s", + w_dai->name, w->name); + + w_name = _w_name; + } + + snd_soc_dapm_route_scan(w, dapm, w_name, &wsource, &wtsource, source); + snd_soc_dapm_route_scan(w, dapm, w_name, &wsink, &wtsink, sink); snd_soc_dapm_route_scan(w, dapm, w->name, &wsource, &wtsource, source); snd_soc_dapm_route_scan(w, dapm, w->name, &wsink, &wtsink, sink); }