From patchwork Tue May 31 09:01:58 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143855 X-Patchwork-Delegate: geert@linux-m68k.org Return-Path: Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork.web.codeaurora.org (Postfix) with ESMTP id EDDFF60757 for ; Tue, 31 May 2016 09:02:06 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id E200527BF1 for ; Tue, 31 May 2016 09:02:06 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D6D7828185; Tue, 31 May 2016 09:02:06 +0000 (UTC) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on pdx-wl-mail.web.codeaurora.org X-Spam-Level: X-Spam-Status: No, score=-6.9 required=2.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,RCVD_IN_DNSWL_HI autolearn=ham version=3.3.1 Received: from vger.kernel.org (vger.kernel.org [209.132.180.67]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9581727BF1 for ; Tue, 31 May 2016 09:02:05 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756905AbcEaJCE (ORCPT ); Tue, 31 May 2016 05:02:04 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:57930 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756904AbcEaJCC (ORCPT ); Tue, 31 May 2016 05:02:02 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 31 May 2016 18:02:01 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 06AB03BE81; Tue, 31 May 2016 18:02:01 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id E6C8C8002E; Tue, 31 May 2016 18:02:00 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id DF6088002D; Tue, 31 May 2016 18:02:00 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id UAD00829; Tue, 31 May 2016 18:02:00 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="212431694" Received: from mail-hk2apc01lp0208.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.208]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:02:00 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:To:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=m+7ZC9qK7Cqqmy9xIJpz+PO5ElXe2MmEC+SllY7a47I=; b=XEOdXhBKjqB1MrGx1yq3hxWn/Q1KZNrj6PBZGFGDNIecB0lvU60YV4M8PR4vNaXickIk7w2fQEr7FPXbASTqhGjxKFQsGnzeWu5ZOXId55B96BIdEc2di/hNxrLPkfMilZ4qQw/8C7ZILVounvWwqy3AxqYhXxKCwTgrq/t8vgc= Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; kernel.org; dmarc=none action=none header.from=renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by KL1PR06MB1702.apcprd06.prod.outlook.com (10.167.63.16) with Microsoft SMTP Server (TLS) id 15.1.506.9; Tue, 31 May 2016 09:01:58 +0000 Message-ID: <874m9esj22.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 08/39 v2] ASoC: simple-card-utils: add asoc_simple_card_parse_card_prefix() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> References: <87fusysjam.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 31 May 2016 09:01:58 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR01CA0113.jpnprd01.prod.outlook.com (10.167.154.31) To KL1PR06MB1702.apcprd06.prod.outlook.com (10.167.63.16) X-MS-Office365-Filtering-Correlation-Id: 74d1318a-e5f6-45d3-169d-08d389323925 X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1702; 2:k2KG8XMyEM1pFC0+pxAYUGV0w6Ozxlt5lLo65UQFvZdaH9Yb6UB/qGiNzTYN11gw0MShthY369RrPEZaBFGLIfFFoh4ykCtJLaKVhB4halYHnQPXPLPS87lA7tXf/cTwLkgGip8Ux6k8RrU+s20SrdfanaXdniGuz6X0avVuT9MjuccVV5Out9P1PEWT8mQO; 3:an9HcGBBsVN06IwKzRaPxNqmhs/uAEMpM/tt5LHXonjYJVKJVUUSz/oYU1504jkc+nTQKClSqMzdWNeWDLIJiEAuPWVQdfZHHIgleCeDUiFAr12D/HnvrPmmtUHZLd7V X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:KL1PR06MB1702; X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1702; 25:4zEBNNFPsPobCv/HHfRW38xdjq0Mr3+nGKexbNpLM39ryqFnuis6jlS0lEKLFLfFgClMSoS2Ay+s2U33meAj73jQcY4Qs2IS0np1dAiGfp2oECmTr1ckuNZawZjmmz4V6w4zqvdYCApPbjrBbWZN5n6clkl9N2ieTipjfxeI0xSa/Zxs73M/YzqYoacnqjLqtUvEf4YB1ej07P/OXUkxyb/kK84hnJv+b0iRSvEjcXB5G2cRbLylwhFM00vTnQv6GGJyGB+pQNSWjULBoCT83f0ardyzzfIyTWYnc8t7dsBhxxDfCIu2rEcVi8+fJP9BrSGFlbgXYzNF43Nlnk+tR/91wlXheWUphQUhRq3igKdYKQ5RkSOe1CBjTOv/HcFP929Wq2gwVk1MpZr7zN2Imo+48YQQ7O9MwHGGPF6VszQe2XoMTyGbAp+YE3Kkb5Uz8LwctPzqFL7zZSV4qUIxMBorf+HnvXh8liycGSszRE4xvkjVd2jvbaKCzAPLDREI9Z6i60e5OEtK0TtyJu/Two/AkrfcMRDZ4pwhOQMfEtKO50ti+Ax+HJSyp2oLnxB0LFUWjacQDhbEGvGQOrji7I1txs/L7daFuM0La9zsjoM/YmMwDJpTHr6H28s2LgO0gB5NQAfEkfgDI1piRehz2GA/VlmE2ALGYdABMddVtB0LFZk3T3McletTI5YP86my X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1702; 20:61oWsGIW32leBz5xrf01rVZOhVBOx1wl0dFIpyMCToeLN7Ub4eaz6aQArZlLD2V6qESP2OcqzOQeXZElNv0fG1XTIbIzGZRG/9y71p7ggL9jxv2EHhq8LTSPnp1v3a5QdYW7JXa1THaaEKntDEKiA3/2JMFx8PHB07KqcbLvNhuwXJp5MPIkYk5frwaTxHVDsR0AkSRt7JrRZd7jTj8ReQcdbuwVMjW1YWbIILbno8EDrBFs3kXsjjBbnjjPG67iam9FuVvwVFU4q4QBQG3MKcMVYMi9Yu6wrx8c8j9vZLV/FKtbVN1jm2gxuhPqb9ft2Zan3ETWHkk4GPqjO92AFTARHyugnopIZRCXP+YJiKo/4NyLJKa7hFEI7TvsjB3Kc67WULCjETdVx79NgxXu5GDZNH2NAKnc+DdryUeqeVBgZkxsvhNIgDDdSKUwXaDogIW92Uzi0lvYlCW0lWmYLv49oqF6S+aVn2xggFc92kkinSwWk6D3RvgT6xb2VIZ8; 4:HQM/gG1Nq/IcHLj68zeSlDvYI80KjvnksqoFSG6XWpcuxHYgYIX2h5WQfOkGKytIz0Qb3rdO/MZgG99SQ0H/JdKe+n3UGSdwGCidIbjFukgpJiYYucVTUzZruxBQ1QaF6TCK4EGjoBpfTrcl9cd+InPdp+4PRpukzt5AOvebq/2HfBQg5JZCBOt+ipEmqCLE1CFnrUfcNkyYgY+9kX1fL1VkXo039WQIr3UWQyEynlh99b1DaS88CgtwfzR7qOE/xGYoqaJ9ggDNgNPmKJ7d2k4db6erbIvCfLxMUj1TiSSCJ+XhfM6wPNKaS5/kzUd6x0KMa1jy6H7B+X6wizh2EwAgRSIweOZ3yvpa71aK+HHUO94ttxjXmSqhtpdeYy2cksNsyD3R+4MH1bmhSLkDxg== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(6055026); SRVR:KL1PR06MB1702; BCL:0; PCL:0; RULEID:; SRVR:KL1PR06MB1702; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(33646002)(5004730100002)(110136002)(36756003)(77096005)(42186005)(92566002)(53416004)(19580405001)(8676002)(5008740100001)(189998001)(66066001)(83506001)(230783001)(46406003)(229853001)(19580395003)(4001350100001)(2950100001)(81166006)(3846002)(586003)(47776003)(23726003)(6116002)(4326007)(2906002)(54356999)(50986999)(76176999)(86362001)(50466002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:KL1PR06MB1702; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; KL1PR06MB1702; 23:O1LQga19APcXUO/S74Z0yqs74GrE1kwlCUxbbKwQ0?= =?us-ascii?Q?NOK28t3pCdIZJ88Rty984+UcyY167wB+aKt7RueN2f6xJ1s9w9W5C3qoGdSL?= =?us-ascii?Q?yFHXGTpQMKAwj+wYt8GwDue8h8nGFyBILjTkOxF4tbJ6aGSX7UT3jKndZc9j?= =?us-ascii?Q?xTJVFLg79J3z2yDRXXmEtcT61cbzK8Vy9rY5s9Bwo7WTMf3Zu7/u+QQxx0t7?= =?us-ascii?Q?OpvhZQHsdNoML6c41Tejkv0oGjsrJZmXDDY1fFFTtji31C0/5N7aeAb2jxuC?= =?us-ascii?Q?yrFct0e+KNDsu9AUgY3e9tcW8xuSyyljjRbxrNlgm+mOumCBP/uPlE78xGDy?= =?us-ascii?Q?rWX5xjgjpW5eprUTJ5mrlSz1LuWrYWqo3ZKC/4vHwVAAMplcOmHRpPT7ewyN?= =?us-ascii?Q?iD0KGpJpJhMqZ4d5pHP1nFyfVd/L7s1p/9HxL2mw/iyIPowWrvLbeMmzkC1r?= =?us-ascii?Q?6EPZ28UJeTmuqBM/P5BkKsY/4duAg5DM9H5CBjiykAMGQtnXYchhDubyCNVr?= =?us-ascii?Q?Ag6TeSp9FJfhsJph5lpobJr/SoCgvDeym8j38umW4VjK3YasYyYDmH++gkHX?= =?us-ascii?Q?OU8spDc4ZaXH0Se084u/6ATQZA6UF2vdQbTs9ApBtgA4Q4Hq/BeaizBrvQDY?= =?us-ascii?Q?9tqUnJmhjzBeGMZ71ad+I9uYUbAcTUswN02WWm2m/YHTBL0uqsEGQ1JbT3b6?= =?us-ascii?Q?ie3JZj90/qRtp/xv+Hj02mddX/ZqiulsM7AVTgvMK7qbmDurLttFsns6e8dr?= =?us-ascii?Q?CbUWJRaIO7mcNCnpbiqMIrSMH/eRNxynhljIIbn4RyAhjmSXiHrFDIRegDts?= =?us-ascii?Q?pikviV8kLchpv0YPDuXl7cFmQ6eIyLkZCPaFOrUeVTSzoI2qVmkajORiuC9N?= =?us-ascii?Q?k/A8AVBICPq9UwmHJwPcPKftA55zt8fBwVVcIwDCqESIlzPBak4Qapn+8VDQ?= =?us-ascii?Q?0LqtzLMGyP1JdpDn4fdNbaY2cQS70kEMr82xvpytTCuWiltWWoO+Z170Dbv3?= =?us-ascii?Q?Xw=3D?= X-Microsoft-Exchange-Diagnostics: 1; KL1PR06MB1702; 5:iSGje5uVzITj9TEGvDVTfQiiGBrfP0J1eTMGsWTtzJxLF7Oqvnem14roxh5fXNJy+bzk96B1y6yzX5BnP6v5nWRhte18olMfza4otKAQAWVoQCD0Kn4oZsR7aJYIql/iiU0lsmJ1xgTCcP2deN42kw==; 24:9BpJvCWQsDyLkBBPKc7NOo+h8K1Ag21Ws89KMY1zHxx7oNMsvu6IZjPt0BG2tnPY/4MqHMrbigwX8eVj1AANCjtwQDGAzr3fAbavLXOETxA=; 7:vYD31NvohnpP1FRXFpe35Mh4Q9gaySfcIYrOMmUKYBUPQzbCctcrKsWPv+iZvAptGgpMFevDyL7z+Jqc+FgmvEwhUAge1gCXh1n0F+P9coc+7X16UJ3qOS/6KEKo1Zd7qCzGeXe6J0nCS2h3iHQU1qocYqYqb4/g0OvCQxms4MklkqpiyT3pVWlz2FsXw2z/; 20:6gcwP4uhg+j8cA2GtKGk2dsLQLSkdARSvny/rIDvyWadLH3zCkdWlc4ahpzYYmR3BeWUitLk9yNde76doL1EDG49xJC6LyL8fJ8M9CMcRn7LLCXNVj+TcGc5TwzSSKIV/YIRentCYHAul4ESsAeJvdDrWDjO3mRA1xg1t9aHh18= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:01:58.3379 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: KL1PR06MB1702 Sender: linux-renesas-soc-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: linux-renesas-soc@vger.kernel.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto DPCM might need audio prefix for route matching. This patch makes this method simple style standard. Signed-off-by: Kuninori Morimoto --- include/sound/simple_card_utils.h | 4 ++++ sound/soc/generic/simple-card-utils.c | 17 +++++++++++++++++ 2 files changed, 21 insertions(+) diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 2f991da..89172aa 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -33,5 +33,9 @@ int asoc_simple_card_parse_dailink_name(struct device *dev, struct snd_soc_dai_link *dai_link); int asoc_simple_card_parse_card_name(struct snd_soc_card *card, char *prefix); +int asoc_simple_card_parse_card_prefix(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link, + struct snd_soc_codec_conf *codec_conf, + char *prefix); #endif /* __SIMPLE_CARD_CORE_H */ diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index c782b3a..439fc01 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -125,3 +125,20 @@ int asoc_simple_card_parse_card_name(struct snd_soc_card *card, return 0; } EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_name); + +int asoc_simple_card_parse_card_prefix(struct snd_soc_card *card, + struct snd_soc_dai_link *dai_link, + struct snd_soc_codec_conf *codec_conf, + char *prefix) +{ + char prop[128]; + + snprintf(prop, sizeof(prop), "%sprefix", prefix); + + snd_soc_of_parse_audio_prefix(card, codec_conf, + dai_link->codec_of_node, + prop); + + return 0; +} +EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_prefix);