From patchwork Fri May 20 10:03:39 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129113 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 46C7D6048B for ; Fri, 20 May 2016 10:03:47 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 38E54279C4 for ; Fri, 20 May 2016 10:03:47 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 2DC2627BF1; Fri, 20 May 2016 10:03:47 +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 1FFC2279C4 for ; Fri, 20 May 2016 10:03:46 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754549AbcETKDp (ORCPT ); Fri, 20 May 2016 06:03:45 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:48511 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754390AbcETKDo (ORCPT ); Fri, 20 May 2016 06:03:44 -0400 Received: from unknown (HELO relmlir3.idc.renesas.com) ([10.200.68.153]) by relmlie2.idc.renesas.com with ESMTP; 20 May 2016 19:03:43 +0900 Received: from relmlac1.idc.renesas.com (relmlac1.idc.renesas.com [10.200.69.21]) by relmlir3.idc.renesas.com (Postfix) with ESMTP id 5FA7F4E933; Fri, 20 May 2016 19:03:43 +0900 (JST) Received: by relmlac1.idc.renesas.com (Postfix, from userid 0) id 625768002E; Fri, 20 May 2016 19:03:43 +0900 (JST) Received: from relmlac1.idc.renesas.com (localhost [127.0.0.1]) by relmlac1.idc.renesas.com (Postfix) with ESMTP id 5C6A08002D; Fri, 20 May 2016 19:03:43 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac1.idc.renesas.com with ESMTP id VAK17098; Fri, 20 May 2016 19:03:43 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211715711" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 19:03:41 +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=jBhQ+qITr+PSlZoEWIYAbusxxjSbkkpraHe+cW4Kkes=; b=Du9DnmKIw38P7HmBS19flKY9i0/K7daHohZLixn5kCQjOFC1mg9ANH0X5tUmdgmS0OheJl8o6YfXaOnPjW7UbMJgwbB+LjwiXuyOXph/TOCkKPK29yhFZ/IMpi74Mv8Gr6XnUrn6iQ6llxBAMacmzhwxp0sZBa7OxtXJf6RcvM4= 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 PS1PR06MB1708.apcprd06.prod.outlook.com (10.167.53.18) with Microsoft SMTP Server (TLS) id 15.1.501.7; Fri, 20 May 2016 10:03:39 +0000 Message-ID: <87y475oxvd.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 40/49] ASoC: rsrc-card: use asoc_simple_card_parse_dpcm() 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:03:39 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0035.apcprd02.prod.outlook.com (10.164.90.173) To PS1PR06MB1708.apcprd06.prod.outlook.com (10.167.53.18) X-MS-Office365-Filtering-Correlation-Id: a9dd83f0-f59f-4133-24d8-08d38096048a X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 2:JYpJ7fbkzGWvo7SzckdQK/taZ6K6DpLgJHpFS1lYSH6+1Z0owS/NP8/TtbJ7gPbQlAuMqLBTAzmIan/O9iHuNTHnRVn8m+pEQ6vagjsrOKb0ChuJdZkydjx+IT2DBqmqd/6IDMvJLZdXsbZsVZiVAtQ42U6GTN4jCAShqvUW7zG1Q59iIiQBt3SdgJ2CckVC; 3:2c/3yEwxoNWCp2b2pWmgKxNOOjSXJ0+5hbsHRWARGsVHwJrawe/Jjrp5vogrGS6rg3RuMfx/247++RxAJBWeRdzAiQbOeuuEYqJylQsdgBsSvCJUdoFZ03nQ2CjBGAC3 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1708; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 25:bSTosw6FqE2laUppvj5tkcAYJHm7GKZ64ESMBm7KsL+yt/m54IeZGTXMjFlxRuwYoy3aEuXvdaDospfgqJsGsR6VsMtbwpRC2b2Jf2EsSp8IIK3IOxO66Xd4H3c4pCuKsLSNAK93Onst+WSuhcQ72i+R9KnjrmmRlFt+7elUlRUHgP1u0XqbUr9TFB2dWQagpQR9LTZknMn1kMOw5kAaarGHjTFlUTZYD4kxkSX5k9E9o4rIff8+TJan5n2aH1ceZXnUaTPSsc9WzQqKjJFmTY2IO7rK7YUcnN99Rwbn36hmY5AZglS0bzGw3K0HTTx/3dgb5A1rBrvjAsk0jdC/nQWd6nq0O3fiw9+O59iYv5xaNWzmZOTKUa0Qmtr+J8/NsKFoth89HpwhApyULckKRrWDDRVKG66XjV8RhNi+uH2AZtPw6Qjowk3pmhIc0ANOXTUlvvborrgT0QzzfnT9twvM9aj6OFJUzr/baFE2DdXNqt7+8AS4CT2xSEWw5MYFrCywkiWU3v/xy5jlPt5er/AYDm/g/kWjW2Soe+6SOVKt4nqwF2mc0s77FhrW4HCZQS8GTmham40DjqDxhhOJjSETuJvJ8+uTOnJ5qJ0b5KuBug3wtduKHGt/6lCEigcZx6CuwMVlo0sWBDHQA9/1uaDQZnPExdm/fSXJt+18M73YaqkP/Tjgiy7QShqLqKp/SU2F9UAkk6iF9XEV1pMz7w== X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 20:Tq6elof+ZPAKaudHGXTLW2BGg1SFok/Cieh3ikwG2SloHlSjUGIhFkyAxfuC384s4i4AV2UFusvObtc5rKKaq5H0sY2Q50B43fIEQEtMIWjkwbaK+qkIkL/ws5D/0sYRpcQAuaQN4JVc1OIIR0pcBPG7ZibnA6Xa9JWEPxU3wKhhjGDH8RpvFvmjRHxXzzZEkqlLT7n1TK6fiRVaAyUhvsIXVmTqgn0ooLa72uY698xpP+/SCxX1poM88+URHvYmiYtdC0VgAQeCm/9M9UF6NyBc8PKbWmgUDy5ODk8Dhcrof2zHroMD4RKazMIZa4wj19I+p7PGaH3LFJofwtTwNdFSJFFMNSmwtwGEWCT488TGlCY0/8/yU3/VFlrasy2jm6JnN+rR6bKfgSAHFmTb+j8sP762JQWMiw9Uf6rMAu0SpYFdZ68dNHDaCQuhJVw83g6QRPlDAoOy1qx7TrW+jRzCDIlhl7lF7yYN2IGLX3hyWZstr1Hs8H1zWgCExXoc; 4:J7qMMsVYGTlbzVFtnTs0wl4oVhoXGFkwvh2poWWqup6doY5OLtWHHv+Y0i9v6352oY5lG+D4qJ4wWdeIUU0N0GifkD/Nkiiyn7y9iopUgHI3FM0wz1Y6Yaxj50sax7aRitAKbh3HT3EvzAKMRxGApFd7j0WuwwqPA3M/VFpx6FD3aU5GFnxc2OYpFaRDYKxhXgz0L5pxzhBm4rBmXkXwiL5t4f4IUf8wdnTnWgesEzbYy7HRx/IZNJR3FQ296exJer5EVCN4maz0Mjzqg2kP5uLTkRfYFIGE+xN3pr91Xa+O4y/afJL9J53JsSsoXryF+LrmL6Um3B32Y4EzIQZCfRueStjJfs/eGOQT/UcGOAIgGmROHZtWEoxlDo+Qw5IbR9oFD4eJD6Frt7X61y4J6A== 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:PS1PR06MB1708; BCL:0; PCL:0; RULEID:; SRVR:PS1PR06MB1708; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(189998001)(5004730100002)(50466002)(110136002)(586003)(2906002)(46406003)(2950100001)(77096005)(50986999)(8676002)(76176999)(5008740100001)(54356999)(81166006)(4326007)(229853001)(53416004)(86362001)(83506001)(33646002)(66066001)(47776003)(19580395003)(92566002)(3846002)(6116002)(19580405001)(36756003)(23726003)(42186005)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR06MB1708; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 23:47G+kB2xMpofaxpeJvNOXQz4XlGxoLyfQMClhXek+h0tpocGu24OevVT1K+D+ySOqHbABkQJXkGxAh8QUTTW9l8JKAKTXvCfBgJJbgEYDXyoFoBPZPYqaOOMjIym4G4tkorLNvzH8kmv13wfN56yGhkV0UG4MvTAL8qEKGJav40c9ynLBKawhHOVXkKG/Xjg8bjwFE6qOEisQbkGUZsDOSx/QrirF2ZLxBlO5UWJeHE9+mF9qXVR7VCd/ftxx2FYsDZD8aAIlEV49v+GAlLTdElRxLalTDLjQs+iStPv//hC0Wckno2pZ9YEjsowfdhxGLhf3+ZCfrahpt8h/6EcqrMg2PgsCpk3eRbXLQ0fbegpOcH2O7wcQnp0BcO6rhzTBh5F46VpKn6o3RyCzZVJ+rT5z40q9Y/4pbDR/jGfFA6mFi7ryTRE1Da0+LjWLSpRbNH+D5a8jqbMAH2mY8nltZKHuquBip1XXkI0PLlxYK7ex41ze+9d41hcPWHRcL2ucJicYznNKWcPhlar+FLgxV1zE6X9MXshla7UNz6UqHa46gDMeLkMeGSyPn8GvIbPuVpi0s772Bcd2M2Ccx9XbPox+ijGFOoTgTH1T4nFgPRm/vMa9msodx6t1G5w1geYGF0VubeH4R0vsIZ6ApSCB3g75fuuE+7ubvNU73LR6/UNCpIAAY3sHM+hUEztuhcCdp18QVd5s8z8QymXdrmCiIjfQYAzl46vY1f0YdvMv6WD/5m009jkYsXcw7W36XxUoGs69ZhV5IPSwYojW6ljmKDEejRgu2h+8UjerClp9/sfh9IwaKcJ9lnv1PefibpJib29zBW712YxrgGRQsff0YfnFJJ52Wg5hbNUxL0uGEG72GCgNaFswc5bJD05qv6GSuDLYcGGTdseccsobg6VUw== X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 5:hT57T9x2RzXa7sacNjwf3d4PeiROIKdrBX2DubR17XejwN43nPyhrRTZ/q+SuEdWweeZWNVQCl7XcPDvelVUt+Rp+873+Gjgv50MuX99Qm4IzyaTBFKtrgZ+uvmofsit4p6+8r2beommm54quqgecA==; 24:GKu5+IbOGja9yMr0rWut9Ajtg/166aNhchEa0WVk1oca3KZnv+OdPNp/yTQququ+L3i5qxZZ45HQsqQzHWpJWkCBx0QgguGA9sfpeeJ2wT4=; 7:C8fTJTg8E6N0+jDmlRuPFq0oiGXFi9/IzpyX6GLoM1gSO2CrEYGQaKl7Ix/Lm9k/Tt1ExWnhW0p4I9eQXmbLnAwuAStiukMHsPVKjW936x26CpQIq8fpvqqpgMNWDDId/GdGzI9FpljXJbCXZbRvpelbhqWP3kCkU72k8f1UKrMHJMtQwUN68qUclNRFiEOU; 20:KQPoJ/KIK+kn6xFzwiJsG325CbXXw2V0FUihXAd1eyQZ26GL5JEnQ+SRzevzoowmM1QzgFvkUo9/A46xzjom3PI+Fz9w0ezIPFGK08/w18G3/Oa9J84qjilkvFAFgzx/eFdxTHYkwTaYnpEAZXocDhVD6Zb9E8GvBZm8aYgoqUQ= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 10:03:39.5390 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR06MB1708 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 | 20 ++------------------ 1 file changed, 2 insertions(+), 18 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index 3053f62..5907fd8 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -168,14 +168,7 @@ static int rsrc_card_parse_links(struct device_node *np, return ret; if (is_fe) { - /* BE is dummy */ - dai_link->codec_of_node = NULL; - dai_link->codec_dai_name = "snd-soc-dummy-dai"; - dai_link->codec_name = "snd-soc-dummy"; - - /* FE settings */ - dai_link->dynamic = 1; - dai_link->dpcm_merged_format = 1; + asoc_simple_card_parse_dpcm_fe(dai_link); ret = asoc_simple_card_parse_cpu(np, dai_link, DAI, CELL, &is_single_links); @@ -202,14 +195,7 @@ static int rsrc_card_parse_links(struct device_node *np, of_data = of_device_get_match_data(dev); - /* FE is dummy */ - dai_link->cpu_of_node = NULL; - dai_link->cpu_dai_name = "snd-soc-dummy-dai"; - dai_link->cpu_name = "snd-soc-dummy"; - - /* BE settings */ - dai_link->no_pcm = 1; - dai_link->be_hw_params_fixup = rsrc_card_be_hw_params_fixup; + asoc_simple_card_parse_dpcm_be(dai_link, rsrc_card_be_hw_params_fixup); ret = asoc_simple_card_parse_codec(np, dai_link, DAI, CELL); if (ret < 0) @@ -238,8 +224,6 @@ static int rsrc_card_parse_links(struct device_node *np, /* Simple Card assumes platform == cpu */ dai_link->platform_of_node = dai_link->cpu_of_node; - dai_link->dpcm_playback = 1; - dai_link->dpcm_capture = 1; dai_link->ops = &rsrc_card_ops; dai_link->init = rsrc_card_dai_init;