From patchwork Tue Jul 19 02:55:10 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9235859 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 E24F8600CB for ; Tue, 19 Jul 2016 02:59:24 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D5BAC26490 for ; Tue, 19 Jul 2016 02:59:24 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C84C2269E2; Tue, 19 Jul 2016 02:59:24 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no version=3.3.1 Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id B432B26490 for ; Tue, 19 Jul 2016 02:59:23 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 9BD56265D1C; Tue, 19 Jul 2016 04:59:22 +0200 (CEST) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 47433265D44; Tue, 19 Jul 2016 04:56:55 +0200 (CEST) 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 D9700265D44; Tue, 19 Jul 2016 04:56:53 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 3B58E265A6C for ; Tue, 19 Jul 2016 04:55:14 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 19 Jul 2016 11:55:13 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id EDE7F4C9BA; Tue, 19 Jul 2016 11:55:13 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id CFFC3480A4; Tue, 19 Jul 2016 11:55:13 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id C6EF3480A3; Tue, 19 Jul 2016 11:55:13 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id MAY14447; Tue, 19 Jul 2016 11:55:13 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="215867217" Received: from mail-hk2apc01lp0215.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.215]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 19 Jul 2016 11:55:13 +0900 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=renesasgroup.onmicrosoft.com; s=selector1-renesas-com; h=From:Date:Subject:Message-ID:Content-Type:MIME-Version; bh=Vi7MXiGvV6oKtY2fPiE44sobOi5NIJTg+krWuzjqlyw=; b=DTnzleHHZanipGpellM6WmZjvIHf0ko3kEWfn1upubcdWcuAs6RvFjYSQ8qO+tqyJJpHDAPQqpgnAPmoNnxX8mhNPsrlzb4PghZXl46t8nESRNvN1z+CEZXvwphe/3/BuGUdeTZJ7LVjGOfT3ZiK3TLXFaymwR3E5+nYbkar3oM= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.144) by HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_CBC_SHA384_P384) id 15.1.544.10; Tue, 19 Jul 2016 02:55:10 +0000 Message-ID: <87eg6qmjhu.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: <87oa5umjoe.wl%kuninori.morimoto.gx@renesas.com> References: <87oa5umjoe.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 19 Jul 2016 02:55:10 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TYXPR01CA0005.jpnprd01.prod.outlook.com (10.168.40.15) To HK2PR0601MB1444.apcprd06.prod.outlook.com (10.165.182.150) X-MS-Office365-Filtering-Correlation-Id: 4c4f7ac2-aa58-4bc5-709f-08d3af80199d X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 2:dn3IjASz8ytVcfb1y5GrakO9hET6CfgRvDrwHMUUM2pv51+PB7wwRAbLDDXmmkVxFO0KWjiqee/W+86dRb3WgJovJ7no0ygGcpuR3JoBa7OwIoMOn6w08otRaPXqY02toXgJ2qpZXTE3ricXSbLaK42Yex1Tt9t0vOPft5WcQV3XAoEN4+p80feZLc1xXwy3; 3:wKMJTEPNUFcz5RcqlDSXv4bEOcPNP6HcumN5b9NeMMc+N7fTRgAT7S85jDITjbR4QZOFdI5UE+GI621lGdjMYpVqOdWu2DO/NILXYCYmmquuvamt80nRDmmFk5I/7g43 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR0601MB1444; X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 25:W581S/C7w2ztU12jzsj8U3ZPI4KC5fNRtwFXX2aVEFudx4yumN4ZiFCW83u6Pz/6dtfe6IoSrvj6KzLUj48ES2HiGVb26hDK0/EHeZ4B5ebXcMG+vuL1fKwIKfzhRK0zhc2TYuoUS5jBfQ8fkQQqjfLG4QhIfJXuoUo0K4E/O6C07oNmDueGYZ5h/EAsT3s4fBf+TtI6RsOCs+umR+kiFxUMrSvXQb+FQ3jkb3VThKXlc/9ZSlZkshFNBTTUXIUn3Qvz5NLaLz/myBZslTTNS7eTWJpj5Fdiv96uQ665uh6natI3K1qYIAyAZPsfxgoEpIakS1CggxDugKtBj4LK8JGJ/xuKrmdPtZreWTIMLomQ+iMeWEoto7FXT0i454tHpxIFzKeZGbgz13MzepBYbgYwmEwqrJ2fI8gyenaJ5DkjI/DBAIKGG2b2tW4cu07zva5xPChM6TXMY+bK+ey4PkhaD67EHj8+cZ/YQNjGx9v7Ob/bpPbv6YE/zBDmYI1nTiP7YgWNO4W87R/KrqpkRDaEfKD4VjRDn++UzZ9XdxYPt0iiGXcZRZ4K9VA9luorHt3I3q5NaoqAs76ALvfPij3LS2zkAv9ImOcrZcS5LUAIkszW7nfObEGeUu0MTL/OYDQZ3P/7//gzsvHEpBP79tOyIHPrJBYqW2XXirwyhgx0BI8z+WK/SRz+C3ddp/L7z8RUVTVneHZKJ8bq+uc0hg==; 31:FDBk1r7vGBQgOVrV+ZnA7yYcOtG7bmCJWUEARVQT5uIDyNsGQT1bEXRvqJuK8TWS2SG56zTXwOnm0YoqUNCPCyOV2Kzyc/LqLKZjxX+QwZCfeTVAvRPCCk53dWj193lLxB0vYl8HleRnH4Gcs5Jvdbc2Ux68N082hRlZIMaw0agg681QE3LuVfRtBs5BMo3Xs76TiRO37sdhMuzLoqzyOw== X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:dzhyDdnrge7CLxFIoWgrZtw5+WyLmsO9uWJ098imUPbQheSYS1Aa0legyT2PtJujMhBFgpcskFj1xriOrc+f72bfRZ5GuhsbP7H1Yx09ePnLkHGkwItu8QEoUuF7fDbCUTF9yqoOMjX1dF2jWHTN7EMiiUB+WnNByTsHBmKDTPtuzz6lvgTqr5NSy7tKUrY8ZrzmAuJ37qHkKoEPNQ6V5alv3KFEHHYrmjhAX+Ugl+HN+fga7geWJzPhjV45qekk4UjP/riUsow8m9IEuu9jwn/VkcxCvdK6pg6vudO1LKyuv3KwqhCamjr3uiIITIglQfDWQie7Y0S9Qp3/G57GTW3ZnJYRCzpHUG1DBrEu0qD/vCEx26+9JseWDs6Bnai8T9/z4wU5XUmpAAtgiCxZNIZDn/onYZIp6n3lWc7e52/GhRgEixobb2RrDwG+LAHJgxCACru/UW6O0mJk0lokLx8o6GeAnQgA9U7B6FpMgEh7qf1fwjbAIc7812btWkVv; 4:yH/TyGpbjCbdL0U/Juk9tCbX9O2wbI4FCt6LjyC02aN9cvzdx4gnbVnpBQ5XKXbEXwhfVtPoYcyrWqjd4AXlWzHqm5sGwdVfAM2DZtM1O9iELvnoNGUmoH/O1k3ttxDxe5bSmJUWRQueEkyteMNzZ50ow1DT+Gj4fRCHOaNo+trka9wx5Z1TeK7dmxS94KRfMmoBgW5SDelX35UkqZqFnWn928iJqOMFMzmAaPOzpyhlqP+phVDNfSgFhAEfR/0v7vA39+yvZ7IHbSFm9jptslScLmvSfCJEK2/N/frItopQZhCiDHUTDJwD6vEF5WpFi8P0pX5DnSPtb18AXjMowjbFK9m05NYBzbOn4wxt+Y04Ou7coSMKyH7TgqLYBfF/usJ9a430ysVQWPGf5reldQ== 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:HK2PR0601MB1444; BCL:0; PCL:0; RULEID:; SRVR:HK2PR0601MB1444; X-Forefront-PRVS: 000800954F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(7916002)(199003)(189002)(50466002)(86362001)(2906002)(68736007)(33646002)(81156014)(69596002)(4001350100001)(2950100001)(4326007)(81166006)(66066001)(77096005)(47776003)(3846002)(6116002)(92566002)(83506001)(23726003)(106356001)(229853001)(101416001)(105586002)(36756003)(50986999)(76176999)(54356999)(586003)(46406003)(110136002)(189998001)(7846002)(8676002)(53416004)(19580395003)(19580405001)(7736002)(305945005)(97736004)(42186005)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR0601MB1444; H:morimoto-PC.renesas.com; FPR:; SPF:None; PTR:InfoNoRecords; A:1; MX:1; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR0601MB1444; 23:THWtIzJAlNuLWSuUzcWcyaMTsMf1xoO3KuHxyXL?= =?us-ascii?Q?2vXSnphGake0XRrOvKlWotxwKmLNuuV8BXGHaRh7KLvO3+YYIyBNcmBO6mfA?= =?us-ascii?Q?yFG8SPtgC3smJF+THWEEle42Ddt64qJawnlSuuZatBcQNDCbZHWEWuvCwFla?= =?us-ascii?Q?w45e64WHjyOpTCBen2TgZeOsXVaq5BOe0TrDzAjCMBWnslVSo3C117LlGX7J?= =?us-ascii?Q?QJWk1GRLtnzBL0/2h+wYEF21rbrf0JO5t+36YVZ5uSIHwP/q60g2mN+eROx8?= =?us-ascii?Q?BD9k4b37VF7o3Rdo5uY1wo/r+zKcZ3tdmupTjl+5X5MiaRORl8oq9LT5jcyR?= =?us-ascii?Q?ZQ4RdXJvIbzBPLkKYvvUOCMvK+G1axu2LpKs6ew0z2mMv2YYssogyRUDoHfZ?= =?us-ascii?Q?O5exrO4ufHZuypaodjU4PKA/rXTGfRifAB2vHxVu4QRrSkv/xa1vn/mV/UkO?= =?us-ascii?Q?p0SMICXdSMbKb10GB2uvRU4nwQ34JInYhdAfA67IO2CELREUx9GVmbWgXvCX?= =?us-ascii?Q?kgkCA74p3FlrfBgfiVkk8xz8xoFoP1vhFWByvkkZL/JhYzO4Z1+mHW8w9nFX?= =?us-ascii?Q?Z9iJtwxVxmfFZbgvzTv7Uq0FawG4tFBXMVLJWFIIcymvHMhHPHql7b11MCGz?= =?us-ascii?Q?LJgQVlbMLv9Osc2uJE3lr8UBsYN6k6XXOU9svM2ysJQup5JBrjW6wLguJ3El?= =?us-ascii?Q?mkwkpoqYIs1WqkO2u/ocT2ks7B5zL+jFgtvKZSLFkjM5ToDab393RnKp5T+1?= =?us-ascii?Q?rqrUdcfJF0q6njqMWECZ8UONmY104JAtdvFUm5PLYslS+gXSrTVwLNN2CQN+?= =?us-ascii?Q?XocYg/RhdDV6run0vVUJaprHBehyYBdPbHLFld/ToMkFkrcuAq8IWhq40IEW?= =?us-ascii?Q?gKGkTuqYgZo2JANAtGB7Fjk12GeedQ5YyUH5nEwKv2060kT5BIGg33sb5B+j?= =?us-ascii?Q?KX/jkN+e9QaX/yRN1/q2a1+PnA8iF+SVVdDzLhXDxK1uMBx3/lEdXr9r9GyH?= =?us-ascii?Q?NspR6wcuFZiSwtwXyMPLGu/nLBzPw3M7U7v8MKAGc3Lbo11/MF9y5DrNBmEb?= =?us-ascii?Q?mXU8ajTx6HXzbTefExm0AXCuw1v8PcOPzA7/r0++XPE8Njp6JdPBFkWfPBdO?= =?us-ascii?Q?i959fR3hVnP9nu1BTFmvqhN+akq2YJZOUfEMCzet6Sx1/yizJTzcKtK5d7ew?= =?us-ascii?Q?CcrN2POQJ1jEvdT0=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 6:NibPOs2gkcDyR+Wr8rtfyySrLZwDMIbVUEwUHfU4LAYqJRs5Y+BfGFya1cYqIog6rZm4eYMN0+mRfugo9C+l7hDXXodNQuBUsiHwbb5CkU8pCa346l77+c7T7VoUhAwVz2XVr9i7fwEePz7q8AEUaL+Knw6sJ8Y0iVeRhujPhs/qn5MZNBW/dWmrlV8eFX15CauOjKy6b8w3bw/6psQ8/bb1koBsEtc5RYiwGVM6mcJupIvtRKm6k56HmjKWIbNUo/oG5YrcFYC60thHqavYdZXdig5ud9Ur/ZXZVRExF1deroiEX8TvRdsGoP1CXXpTdWrZZlYzq6eU7I4Eg3hIsg==; 5:9Ige0zsXmEnMPyspYmeL4rQlNNFQn4wR5OO7pNQK6kO2tandIB1owkUpOEmt7AFe8usmR4AhpGJCBdoMULlHB9A5OwsJQfAkFfC72cWCOjJv5dtFVEkLFZIANWwXfbY2yRqqOTbCqM1g9DPRR/gXHg==; 24:wxzSpkRhJiw8ej9/2TVU8iAwziOgztiEiQpyMa65rMu2zk+8AdJRFwakadXLEPfon7GB5TFuR9lmAUtJ1LRaWjIua6zAHjtP/YSQ9bAjeQM=; 7:YlP5Gj0nkpFpkEG0F9aKNxkxrlEhH19alQ5KiWERgBKnlXM5MhEwH9OwShglOgxbZblqj5eZQL0bGtIV7j9gwIvJeUhiHQngI1/lZvPRbEnRTVuY2beF1fHqFeoyUW6ZkrxNYGlSqtONoIhy7G3xh1qKh+XeWWOLxfMZDm32B7Bt8Z52Df5O3/lLMhNjj2IpsiTgLPsjCobrac6/KqmjT45JRbstxlHwGQaRv2wtAjMNF+V5XG01d3X6gzVQOJGo SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR0601MB1444; 20:z1P86fOqPNLm+55dLEvB9dvcYiogljWhgQxeqMd9LGEnELXTLX6cfl3F3wTZioXNwMQPBH8e0nvTOjf6UUXNqtapbSeSPVKmW+m6uNcJdSAgO3AjkPHCQkM237INiOdLk1oQ8HK1hIoRKmbMXQB6iHvvVMa30LMoFvD3jArdgRs= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 19 Jul 2016 02:55:10.5251 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR0601MB1444 Cc: linux-renesas-soc@vger.kernel.org, Linux-ALSA , Simon , Liam Girdwood Subject: [alsa-devel] [PATCH 6/7] ASoC: rsrc-card: use asoc_simple_card_parse_dai() 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 Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/rsrc-card.c | 27 +++++++++++---------------- 1 file changed, 11 insertions(+), 16 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index ed5391f..82187e0 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -62,6 +62,9 @@ struct rsrc_card_priv { #define rsrc_priv_to_link(priv, i) ((priv)->snd_card.dai_link + (i)) #define rsrc_priv_to_props(priv, i) ((priv)->dai_props + (i)) +#define DAI "sound-dai" +#define CELL "#sound-dai-cells" + static int rsrc_card_startup(struct snd_pcm_substream *substream) { struct snd_soc_pcm_runtime *rtd = substream->private_data; @@ -155,18 +158,9 @@ static int rsrc_card_parse_links(struct device_node *np, struct device *dev = rsrc_priv_to_dev(priv); struct snd_soc_dai_link *dai_link = rsrc_priv_to_link(priv, idx); struct asoc_simple_dai *dai_props = rsrc_priv_to_props(priv, idx); - struct of_phandle_args args; + int is_single_links = 0; int ret; - /* - * Get node via "sound-dai = <&phandle port>" - * it will be used as xxx_of_node on soc_bind_dai_link() - */ - ret = of_parse_phandle_with_args(np, "sound-dai", - "#sound-dai-cells", 0, &args); - if (ret) - return ret; - /* Parse TDM slot */ ret = snd_soc_of_parse_tdm_slot(np, &dai_props->tx_slot_mask, @@ -185,9 +179,10 @@ static int rsrc_card_parse_links(struct device_node *np, /* FE settings */ dai_link->dynamic = 1; dai_link->dpcm_merged_format = 1; - dai_link->cpu_of_node = args.np; - ret = snd_soc_of_get_dai_name(np, &dai_link->cpu_dai_name); - if (ret < 0) + + ret = asoc_simple_card_parse_cpu(np, dai_link, DAI, CELL, + &is_single_links); + if (ret) return ret; ret = asoc_simple_card_parse_clk_cpu(np, dai_link, dai_props); @@ -209,7 +204,7 @@ static int rsrc_card_parse_links(struct device_node *np, * fmt_single_name() * fmt_multiple_name() */ - if (!args.args_count) + if (is_single_links) dai_link->cpu_dai_name = NULL; } else { const struct rsrc_card_of_data *of_data; @@ -224,8 +219,8 @@ static int rsrc_card_parse_links(struct device_node *np, /* BE settings */ dai_link->no_pcm = 1; dai_link->be_hw_params_fixup = rsrc_card_be_hw_params_fixup; - dai_link->codec_of_node = args.np; - ret = snd_soc_of_get_dai_name(np, &dai_link->codec_dai_name); + + ret = asoc_simple_card_parse_codec(np, dai_link, DAI, CELL); if (ret < 0) return ret;