From patchwork Mon Mar 16 04:45:05 2015 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 6015261 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork2.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork2.web.kernel.org (Postfix) with ESMTP id 014AABF90F for ; Mon, 16 Mar 2015 04:46:11 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 24C0B203E3 for ; Mon, 16 Mar 2015 04:46:10 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id ECA0C202F8 for ; Mon, 16 Mar 2015 04:46:08 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 0B5D526054F; Mon, 16 Mar 2015 05:46:08 +0100 (CET) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00, UNPARSEABLE_RELAY autolearn=unavailable version=3.3.1 Received: from alsa0.perex.cz (localhost [IPv6:::1]) by alsa0.perex.cz (Postfix) with ESMTP id 2E51B2604CA; Mon, 16 Mar 2015 05:45:39 +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 9F0BB260575; Mon, 16 Mar 2015 05:45:37 +0100 (CET) Received: from relmlie3.idc.renesas.com (relmlor4.renesas.com [210.160.252.174]) by alsa0.perex.cz (Postfix) with ESMTP id 4E1802604CC for ; Mon, 16 Mar 2015 05:45:10 +0100 (CET) Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie3.idc.renesas.com with ESMTP; 16 Mar 2015 13:45:07 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id D31A441408; Mon, 16 Mar 2015 13:45:07 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id BB7172806E; Mon, 16 Mar 2015 13:45:07 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id B75E52806D; Mon, 16 Mar 2015 13:45:07 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id PAT14810; Mon, 16 Mar 2015 13:45:07 +0900 X-IronPort-AV: E=Sophos;i="5.11,407,1422889200"; d="scan'208";a="183126358" Received: from mail-sg1lp0094.outbound.protection.outlook.com (HELO APAC01-SG1-obe.outbound.protection.outlook.com) ([207.46.51.94]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 16 Mar 2015 13:45:06 +0900 Received: from morimoto-PC.renesas.com (211.11.155.132) by HKNPR06MB308.apcprd06.prod.outlook.com (10.141.37.28) with Microsoft SMTP Server (TLS) id 15.1.112.19; Mon, 16 Mar 2015 04:45:05 +0000 Message-ID: <87bnjtk0uc.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: <87egopk13d.wl%kuninori.morimoto.gx@renesas.com> References: <87egopk13d.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Mon, 16 Mar 2015 04:45:05 +0000 X-Originating-IP: [211.11.155.132] X-ClientProxiedBy: TY1PR0201CA0003.apcprd02.prod.outlook.com (25.164.90.141) To HKNPR06MB308.apcprd06.prod.outlook.com (10.141.37.28) Authentication-Results: kernel.org; dkim=none (message not signed) header.d=none; X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HKNPR06MB308; X-Forefront-Antispam-Report: BMV:1; SFV:NSPM; SFS:(10019020)(6009001)(50466002)(66066001)(46406003)(36756003)(33646002)(46102003)(87976001)(42186005)(53416004)(77156002)(86362001)(19580405001)(19580395003)(83506001)(77096005)(62966003)(54356999)(76176999)(92566002)(229853001)(40100003)(2950100001)(50986999)(110136001)(122386002); DIR:OUT; SFP:1102; SCL:1; SRVR:HKNPR06MB308; 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)(5002010)(5005006); SRVR:HKNPR06MB308; BCL:0; PCL:0; RULEID:; SRVR:HKNPR06MB308; X-Forefront-PRVS: 05177D47DC X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 16 Mar 2015 04:45:05.2934 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HKNPR06MB308 Cc: Linux-ALSA , Simon , shiiba , Liam Girdwood , Das Biju Subject: [alsa-devel] [PATCH 02/12 v2] ASoC: core: add snd_soc_get_dai_info() to get driver infomation 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 Sometimes sound card driver want to get cpu/codec driver information. This patch adds snd_soc_get_dai_info() and enable it. Signed-off-by: Kuninori Morimoto --- v1 -> v2 - no change include/sound/soc.h | 3 +++ sound/soc/soc-core.c | 29 ++++++++++++++++++++++++----- 2 files changed, 27 insertions(+), 5 deletions(-) diff --git a/include/sound/soc.h b/include/sound/soc.h index 235db71..709f058 100644 --- a/include/sound/soc.h +++ b/include/sound/soc.h @@ -1505,6 +1505,9 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, const char *prefix, struct device_node **bitclkmaster, struct device_node **framemaster); +int snd_soc_get_dai_info(struct of_phandle_args *args, + struct snd_soc_component **cmpnt, + struct snd_soc_dai_driver **dai_drv); int snd_soc_of_get_dai_name(struct device_node *of_node, const char **dai_name); int snd_soc_of_get_dai_link_codecs(struct device *dev, diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 3a68f13..5b01505 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3454,8 +3454,9 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, } EXPORT_SYMBOL_GPL(snd_soc_of_parse_daifmt); -static int snd_soc_get_dai_name(struct of_phandle_args *args, - const char **dai_name) +int snd_soc_get_dai_info(struct of_phandle_args *args, + struct snd_soc_component **cmpnt, + struct snd_soc_dai_driver **dai_drv) { struct snd_soc_component *pos; int ret = -EPROBE_DEFER; @@ -3486,15 +3487,33 @@ static int snd_soc_get_dai_name(struct of_phandle_args *args, ret = 0; - *dai_name = pos->dai_drv[id].name; - if (!*dai_name) - *dai_name = pos->name; + *cmpnt = pos; + *dai_drv = pos->dai_drv + id; break; } mutex_unlock(&client_mutex); return ret; } +EXPORT_SYMBOL_GPL(snd_soc_get_dai_info); + +static int snd_soc_get_dai_name(struct of_phandle_args *args, + const char **dai_name) +{ + struct snd_soc_component *cmpnt; + struct snd_soc_dai_driver *dai_drv; + int ret; + + ret = snd_soc_get_dai_info(args, &cmpnt, &dai_drv); + if (ret) + return ret; + + *dai_name = dai_drv->name; + if (!*dai_name) + *dai_name = cmpnt->name; + + return ret; +} int snd_soc_of_get_dai_name(struct device_node *of_node, const char **dai_name)