From patchwork Fri May 20 10:04:40 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129119 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 6E7AE6048B for ; Fri, 20 May 2016 10:04:56 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 60EBD27A84 for ; Fri, 20 May 2016 10:04:56 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 55B6D27C23; Fri, 20 May 2016 10:04:56 +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 D952427A84 for ; Fri, 20 May 2016 10:04:55 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1755732AbcETKEq (ORCPT ); Fri, 20 May 2016 06:04:46 -0400 Received: from relmlor2.renesas.com ([210.160.252.172]:22287 "EHLO relmlie1.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1755727AbcETKEo (ORCPT ); Fri, 20 May 2016 06:04:44 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie1.idc.renesas.com with ESMTP; 20 May 2016 19:04:42 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id E130248244; Fri, 20 May 2016 19:04:42 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id E5D011806F; Fri, 20 May 2016 19:04:42 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id DF3FA1800A; Fri, 20 May 2016 19:04:42 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac3.idc.renesas.com with ESMTP id VAB09189; Fri, 20 May 2016 19:04:42 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211715773" Received: from mail-pu1apc01lp0016.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.16]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:04:42 +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=CqXO4ItPXv+voFoE+b71Fvx12u5/AgsKZSlMKXyM2Xs=; b=lBcx4yo+D/kfuIOXwbOA+cxj15mYCAhZAi2rUZnhQEm/RYlj2LT7NlSFxbgnAutmxA/36ioEyyzrS4bdGU+eBxd6Eo34H4BJbV64tU4A2aV7Z7kqXNm9DG31CV/555llxoq7gIFF9GpATW2LzQ6OSvboaduLhLZ1oeUh69U3Qzk= 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 HK2PR06MB1699.apcprd06.prod.outlook.com (10.167.73.13) with Microsoft SMTP Server (TLS) id 15.1.497.12; Fri, 20 May 2016 10:04:40 +0000 Message-ID: <87vb29oxtn.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 42/49] ASoC: rsrc-card: use asoc_simple_card_parse_tdm() User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Liam Girdwood , Simon , In-Reply-To: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> References: <87lh35rs8w.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 20 May 2016 10:04:40 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0014.jpnprd01.prod.outlook.com (10.161.225.152) To HK2PR06MB1699.apcprd06.prod.outlook.com (10.167.73.13) X-MS-Office365-Filtering-Correlation-Id: aecf40cd-6661-4051-e4a8-08d380962907 X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1699; 2:yuftAU1rRR4AHfdfX74K0SjA7TbzIQi1hU9bx1x8m/4svBeSLYHwpxtzE4jVSCw1C0+HH9gAhaaCOuBvxJ4qB6TFDQWU+G8vQiisqpMRezCaTFp7wLGIye8dNt2rTvs7R3B7/iJHz+oDdp78YtTdNWTIpZVKmD+QN/qVrQtInL9hstRpfSPZxZ029AmkxUwM; 3:YLnmr8c52Dh03J5thQgCl3AZPcfpb6c5aS1myEcdsrTpOtxVa1uNlC3qVSWhcrP46YbymtGR0hm874GC+wNLbWNF2YvcKiPXo5a1JICqWFIO+vE4T6YdFdhowg7djS6r; 25:OA8GadVYumCQaqsprYPFv+OjICS8j4oOiEePJZjyDLlxf3O6kNHJgXQQh/KBJSd1y+OSukKVGey+OeOogQDUNfW013e7qIE3OjUYQ8X9Uuqf0eaKES0zCE70HgRCc0YM+SvfuWKKufuvxr/zqY9ialwXMmsse+wA/+vLv4F+LXTz3jhfRWyF+Ygm0eygwzAK+pZjPWh/VSiuTxC3EW62O3KzLJh3OvMKSE/KYUmzKGztAbgO+JdKj+XbXyz1DSjqOX6qbOBrCbgj91PNw4c28FzM/tePwMZqtsmJX8qcDo2mu390KZ7Q3yMGporZSbdZQzqanzV7Eq1K9TuEPqk35pd/9JYLr8kPLYlGPxrPMqRMdv2euIf1dDVv+Ih8US8ANxS944yO6Ke6q5a9Mfdm0zSS1PX1/s66piMvzSJQm4I= X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:HK2PR06MB1699; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1699; 20:FP3HtQP8LYq2F4RjWTAhNC83w7a5gbbBWO8euYA1YVDZNNejzEEYsXkYbOo+M3BQ9OaoCOVQNRqIeYAUSV9/ek8NQb7N69J+rXimU9xvz5v0j6svRVn0JYf3k/TogVFltDJbKL2j60JNOAFfVZ3WztobJ0AreUpP1qrKRlbAzVLPuLwSWF3TpLeyWj90ErJ/C+jEKMPjAI4U1oBa2yC2MbyQgrKBHg4mYa+pHllPDXtEWzbToW1rWOzW7HLax7C6zF/IoMJcXzYPgryO5sKqLgJA6sA4D/MZzkMuyZUvMJxnHep1fK0nAsCQOZXxFMtFRqLQNN1VyyOdXMdhusGIIObi1eNdxDQxHr7JuX7EMzS/pQJNHO7XSVzcyDb8GJXTOenLOirPAqyG1N0hj5Rp42PSGzcZ+yI8CUxXgjhQs1pAcLTXRQSF3z5ZNc5CgR1ve7WVythpCZBslN2DEciP64JZrdkmC2/KEYVhnJezDOVrW164aP9unUPhGRvLCVO/; 4:/XlkfWsETDlE87QR3hvelwYJoaG4ERy9qqcpAPXf3wmEH31+gVTAD9T9lHcDo1r+AkN6GOCnZAKFp35N4Eik7esi9WaHQDXtjC8rriIL/1gYfmZ3iWo5L3txrRE7GQ9jNsm/3T6feweHFPv4l8HP2Gow4YD/Xp0RKydLPdYVngRvFDCF0LWbYXJRMvmJlUqlRaPByeQKRkCHmycQcoBgAhbhHG5HUM4PFCHzUc3GShBq5/XfWAn+vM16qStjkd2CF7tr66YybjKfAyp/wmiq4NcytKI8cwMfPO2usvJ1X4592QHdO0SmWlfyZzuiHxeY6ZNAY/0TOuZl02pCbA6hP0nT9htvFQoK2ZBbSp6Ek754KS74LeA5LYklgr/UWCJYNlZxNitQ90oxZLK9UNFjzQ== X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(601004)(2401047)(8121501046)(5005006)(3002001)(10201501046)(6055026); SRVR:HK2PR06MB1699; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB1699; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(86362001)(19580405001)(92566002)(575784001)(8676002)(19580395003)(83506001)(46406003)(66066001)(47776003)(53416004)(4326007)(2906002)(81166006)(42186005)(36756003)(189998001)(50466002)(2950100001)(586003)(33646002)(77096005)(50986999)(3846002)(54356999)(76176999)(23726003)(229853001)(5004730100002)(5008740100001)(110136002)(6116002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB1699; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1699; 23:f7e2bU5FqVz5AJI+ZTfO94BM8QtGcTDhvyApRyUJ+lcqOjkY3Ls9xgMwafIhkztKRAs2SH2E6DpL38hN92Q1xMvKRi63Wa7FjNfJ8QFEMbLlwM3Me4QF9JrKTD9HA3s5RDjuXbUsgoaTwdymQARscWFyf7NWADUvzRgn14eCt6r2J0zNLrxtoK0sU5OUc4XMi8jZeJ0zQVOePSdvtFU3sMuAfh6a6tvPApPtgjzg8MjusRzT7zkddE8+gxjO2YX9tnkuqzeSiPng2LXYE+sKPGYVszUtlOkFgD0GAeVbUnwjEPr3VbFwV+zd+tIb7n6fES5NWIw8Wf5KdKOxXH5egdH29SPvzQTTPSmyqJuDcE2dAEXoorjURKFFk/6YqH6y7MkAfrzI+LYv5hU39fw+sHLyozoxoV5sskN+DcbJ7qMeWOC6XremruudDNp1EMJt/md6WgET9YU9WxjqlQOr0GnT9bF70hleDzaowhtELlttLpQOWQuc5+2EJyzxePHziMAtr09xN2+MQ1nPtHnDIvNtyaauYOLD7khsMohaFeLAoT98CJuO4P5SH6CMTVmeDqYe2Hr8/fAQX87SJFrN8C9s0oxaAlji5yCUHgHnNDKI9Que/7WLnneKsGAuPsD8nc8Zd6+xNIWLymhHoSKLM7oKIR+rTCCF43T49WTLkGhmY4visNQ99/Dc4wEUNlcrZQffnis4tqZWeda7Z0GMUocAodfVG9DlgeStTd29rToPM5Br1FeJyLSZMAAy44gzl2zddXc4l71Ke7jFBlv2+Ym+8yot9HDqBs2wHrd7DGQI+BwSLVIC7309QFDoQV5aKMFFq0L/b5X4OsdOpZ/aNa5DjWl1U7gjtr6emglD/oBGXzLO6r/ao/Wr0/hyMxnmm4ehazSxltEf6E7jbuUfSo/BJPFXr9jpUFBvhYla2 fE= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB1699; 5:BqIt2IpNrdyq9U6Q3BGSgSXeF0HLsUv1v6A1SbZJFGd3wMTna/QzVzQ5TXrmeauc9TiK52qwtGkOHo6koD5XREkFFUZTumcrsOxlou6VHq4T5ynRQBa+XFs2kJS2pdSVYh5RVvBOjrU/fprusUVq5w==; 24:mFmOuQREd+6N3qzRmeGlPCCz6MXlt5zgwAATXq2EukxKJA7qfCnRy5BfdDp3uBKo0ny8GCgrhDL/CJE7wQca44ooIZtCoZ5lLnbUWrGiisE=; 7:ts1UY1H/qix+YVbIOETMD29i9J/ly6F9JLHEGLlljuwVonQ/LQcVQBnVHOHA6SyiTYDFue6HM7B4J+c/3ui9e5lrWOvlhxn90o3YlhgQL3xhzv3iIDrJVaPVRDtZ5I6xO82/AOibPRved9iHgUNWTPgEQre9ioSBtmNpCZmA5mvVSTh61SN6vCVwILPThphh; 20:lPFzSsgCVDL8p2QuK2rwEYTbHNcEmtn+0AngofKKtHSe3PrYgOMpbSiMTPGGBGtRxgdE1ABNJvxxNJjVMonlDbLTwS9jme8Zx3p55kUyWQ6PkPue/3zuBRpW9hISqPIgJbF3GenNue/fvliBJkSNTE3JiHeKUHKDUSXX7AF3vi4= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:04:40.5735 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB1699 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 Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/rsrc-card.c | 13 ++++--------- 1 file changed, 4 insertions(+), 9 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 3cec0e8..de59a4a 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -158,15 +158,6 @@ static int rsrc_card_parse_links(struct device_node *np, int is_single_links = 0; int ret; - /* Parse TDM slot */ - ret = snd_soc_of_parse_tdm_slot(np, - &dai_props->tx_slot_mask, - &dai_props->rx_slot_mask, - &dai_props->slots, - &dai_props->slot_width); - if (ret) - return ret; - if (is_fe) { asoc_simple_card_parse_dpcm_fe(dai_link); @@ -218,6 +209,10 @@ static int rsrc_card_parse_links(struct device_node *np, } } + ret = asoc_simple_card_parse_tdm(np, dai_props); + if (ret < 0) + return ret; + ret = asoc_simple_card_parse_dailink_name(dev, dai_link); if (ret < 0) return ret;