From patchwork Tue May 31 09:13:04 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9143955 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 EC57660777 for ; Tue, 31 May 2016 09:13:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id DE7342793B for ; Tue, 31 May 2016 09:13:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id D0F0228185; Tue, 31 May 2016 09:13:11 +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 55B152793B for ; Tue, 31 May 2016 09:13:11 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1756879AbcEaJNK (ORCPT ); Tue, 31 May 2016 05:13:10 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:25542 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1756867AbcEaJNI (ORCPT ); Tue, 31 May 2016 05:13:08 -0400 Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie3.idc.renesas.com with ESMTP; 31 May 2016 18:13:06 +0900 Received: from relmlac3.idc.renesas.com (relmlac3.idc.renesas.com [10.200.69.23]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id D84C849948; Tue, 31 May 2016 18:13:06 +0900 (JST) Received: by relmlac3.idc.renesas.com (Postfix, from userid 0) id D78C61806F; Tue, 31 May 2016 18:13:06 +0900 (JST) Received: from relmlac3.idc.renesas.com (localhost [127.0.0.1]) by relmlac3.idc.renesas.com (Postfix) with ESMTP id CB6D91800A; Tue, 31 May 2016 18:13:06 +0900 (JST) Received: from relmlii1.idc.renesas.com [10.200.68.65] by relmlac3.idc.renesas.com with ESMTP id UAE13440; Tue, 31 May 2016 18:13:06 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211981255" Received: from mail-pu1apc01lp0022.outbound.protection.outlook.com (HELO APC01-PU1-obe.outbound.protection.outlook.com) ([65.55.88.22]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA; 31 May 2016 18:13:06 +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=nNed6AmPD4wF8x7mWCy2x4ZHBNZV4SlaMwbzXUbGgC8=; b=LdB7tjftDnjZHXm+PwcCQ4PTdG5n11J9fWE113+NCenGjjhu8s99YACn6eShPYi63ng7615SmQQ7mZ18wXN3JwtK/0DPza9Cfhl5HB/TafqNdiOYek4NgXjxHFTaTYKod4KvxhKIBJwJeCNYIhYunD7zZFdHHAQSKr4n7+4WqZI= 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.506.9; Tue, 31 May 2016 09:13:04 +0000 Message-ID: <871t4ir3z3.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 35/39 v2] ASoC: rsrc-card: use asoc_simple_card_canonicalize_dailink() 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:13:04 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS1PR01CA0001.jpnprd01.prod.outlook.com (10.161.225.139) To PS1PR06MB1708.apcprd06.prod.outlook.com (10.167.53.18) X-MS-Office365-Filtering-Correlation-Id: b127da0f-90d6-4684-773f-08d38933c63b X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 2:dmE4wO3cCA9nPSg0iJyIy7Dckyt4+2am/eGjlap2g0VC8I2hrFZoyeLnyM9cLkJenmbdtMhdA3O+CKe6HFsvF2HvHLPXiezLgSQUPQ25GzCo+1FaceNRdXnERoktH5Elc/B7ppZ35L2BF4s56W4JDsIjNrOqDyu7tAyLbb8P0ShY22s5RjaHu9DFwOtk9Df3; 3:45bvzb5A3FCpnMm7AtjDAfjh54E6O0OwTrLW4jAs7Ge9ctOb3XNgRBpfvLomSdHCuuck2kO188YWpXf0zzAXfcLjwU1HjZJ71x3FT0LXknX3HXUEeXCy0xbX8g2tDH00 X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1708; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 25:OPwqrDppatUlz/S/7wzSLdsMH4PZhsI/AWKwFLRacTqXv+77B/BDTTpoDv0kwMkoPChp6BfAZwrZ85Z6KaNBfjn/zJ0HfAqj5JyKdaEnRXcj1k4KixPIoBEs05FHwmvpK2oaIPTVzWNDmepVD8cQtVem0jywqNlvspuly1H0Zg1yACfAk6Mf7jM618tsl9I0TPbbM1vPdguo5L7iweWrLR5uihOvbaZMbE46AoK76JijKJKvno+Sz9bD3Geh7XTPTJqMd7xgU7M63X9Hzv8nSEIVfXcrFvMHv4i303gt4/mqCMKEuVBhA3kUCL3+BddqFP2nRrde5Qmi0Bnpw/1MWAU/3SrihT0Wkb8yE9QSiSkWUUPX7JaFWycKneBgU1mZmMNSjiNC9oFpEil1A57cm7nUkgACn34S4f/4dB63ENBZtktX/yI0CZ5VRBxgB5Yl7uEcbkGhXiDyYD7SigvMkTmx9EVRZRIkkhrIsvbH7rJqo+zYJQAuWTg8xqF7k3sSXboFjhK8bG6uuyGkeLEEjmBBELoTfqaI+3CIWBW/rpBicnTBVIalGhZwUeE9a83+XsAzFbfIDrfpoH4z6HpSlgaEYxHcXD+b4wKSVSclNwkiF1vpSsP3oXXgD816YWqYENj2NZHpx65Y2A/7lvR1HPtW+ewtqElwUWclkhFm8J9xzkZApazICyeA+tWOweDU X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 20:Dw99MwTmEZRDPEopx1Os6dJO97q6R+5gGnfCEwqFC95blrGMQwrPm9Dzughq/xOFrOIqd2Z8h/A5SFH2Kma5uP2BsjFi7u7zZeqNiuHkWLPpKOK2ZWW3qxFD7p3JjwGI3fhLEoOiDFcH9Apr/Wx2z+tzhDDVuiYzIU97a6birt/nr6xmNSFwDYbFPuR/LKfR7ZpmpcGzKxuWWnU5NX1LvGRwniD6rNclwrC1oE6n4gMuWD0LrdS05G/Bw0XvgmhyJunkM23eT9HX2AwK/Aw5wGVGYsCZuLiOAqkoxlxuTAfKSeaOv7BdIgbOmzpCqiUNtMXpeCp0hJsUnw9d4meozb0eHJz1FzLkgdrFvXblIlvz9YthaV/unEho+LtILryyalevFVTaiFxIpqZ0IbJLgHvGowfjsLFc/m+1ag+/WKvdHGNJuQfC4rXc99u9ILTM5QiVEeNqulDXgFGJUmBdVcrTZgiaFmhdTQ4HkqZnPulQ2Iw+y0/ojlwpu4N7NE0f; 4:bsXBlIGWVd5KWyvOxMuQKZG6VKsOVBlhS+2WSM4b+tgJpJkdK+WbkKf/BYuGKVkwDP8VWRMk67VKm5Ysy8xCBpzFC/7gFqTDiHmyvIrd2Z4K9gujfMhQ5Oep19zec6a6wHLTvZT3d5JfSekHq51DqjAOkS2D/7KcIkIRGXvhDht1mUABNsu3ecs0L4BWq2akrYQv92J6xPXlaPAa0HbBpvikvtOQF4bsx2VUsrWUlG11vq3tyYE+ZdW+4KBNVtafoH2agY96jeLhK/5W1TulDmdliZylzaeVIur5rVehypC2ouui4VLolj1+oE+ydLhuQQ2k2DO+Iju4XABvVrtlOTsDEoakKfTlhp3Ujst+Eb7P+quX6wsSiyjX1l9zgwhx0D5Y4UwoYuiKwgqjtlFNow== 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:PS1PR06MB1708; BCL:0; PCL:0; RULEID:; SRVR:PS1PR06MB1708; X-Forefront-PRVS: 095972DF2F X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(5004730100002)(53416004)(5008740100001)(2950100001)(229853001)(36756003)(33646002)(77096005)(92566002)(19580395003)(3846002)(586003)(50466002)(2906002)(189998001)(6116002)(19580405001)(46406003)(8676002)(81166006)(83506001)(4001350100001)(54356999)(76176999)(4326007)(66066001)(47776003)(86362001)(42186005)(23726003)(50986999)(110136002)(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: =?us-ascii?Q?1; PS1PR06MB1708; 23:QmBQ4sz8czzLVTaZpOYwVGrQpyQc6iyYKF6msy7Bu?= =?us-ascii?Q?E11kht9pchH3hnx6/BdCq1pRMC/cJOADn77XxtUNskFvTbycN/tpUIpA+Kjc?= =?us-ascii?Q?Xx6ab9qayJNLcqHADnkgx8hMq1/CHQrJeFrlDyztGLgTRjZFdTYqGF2zhyBp?= =?us-ascii?Q?toC4Igy/I0HY9FKOF2wxA2l2T29x+mcaPJYiEzc1b5tgWcSUpCHky+aCo4tO?= =?us-ascii?Q?kNt9TpiGOdKFt57IasH0p7YvsGWp8jYaV/RShpVB4J/dCskANquZzwN/7zTR?= =?us-ascii?Q?k4K4Tw8ekienGIxuyDtDaCg/J1hf+pQrkYQ8fUj8ZvBI5YyBvCdEIlK+8Jqo?= =?us-ascii?Q?AnqsgG5KzDTIUBJKWy/7Uy/KC01KnsDWlflpJ6t4jvo2b89rETmM34tnUQP3?= =?us-ascii?Q?gUuHhP/xF46WPMEsf1+nzHWcEFcPIG/Y2F9oYOVgRTNUnBwxfxL1F00sKpLD?= =?us-ascii?Q?mr0zfATyckdLFgdUgi5v0l1q5jG3AM1H0QkqSSbG12nIlxkiUYaCbsFevlao?= =?us-ascii?Q?DRzEVFH7cA+j4YaDnBjR59e0IGaBNvnn2iYftZWdHx7NF3x5U33g/RoK6oJ+?= =?us-ascii?Q?nFNOCYV4Tb70JQn8hXttjCVd8ew5demZgR7UodgvuCB//mVwFh0PuQkUAMny?= =?us-ascii?Q?uI3C8XxmhQQRjNb+axvSfEGbF+x2k1/+8rJfEVxvnOESWuPbf6tTMcNHR2x0?= =?us-ascii?Q?9C27xrcyUjj3wes9u16gXPa+P4xwHEAW+dtU5XFqfioIb5oRdxK9mGe62MJB?= =?us-ascii?Q?ZWMDH/k1JXaIiDxuHGI/qQnSdT1N58W5fWPhFNTnFNTV1T286Aa6GvUpgxLl?= =?us-ascii?Q?oMxKMylKiEt64tRLj6GichqONBZZ5j5m7QJBcrxZe0ByQeoOUue9WNXMwYDJ?= =?us-ascii?Q?B3iWt+UPMA1jS9l9aIrtbisJ8YnvIMBZhXFLptiRl9Jt1jUPpYxcSEqZzBWl?= =?us-ascii?Q?98QSREE0PoHrXgAWbbT5reSb7Fbmbf+8PDCKgtxgg=3D=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1708; 5:g13Hk419H4tqsL2rqoXxkQg0/+QIn5rMLWAxxxpx7YqTPhNbjPLZ6qWzjFeEwVuAbwK6a0xjzT0UyVC7ScHX68N51QXqBG+vMnQLYGmRahAv0RYGU10VG/eI6PobkgwMH8cNVgQKbOED5ToRBYciqQ==; 24:ptBkismlzdGwMLZWKAhLfgTaygfY3t9NP2XdBoNIDaB3Gh+0BpqCjcbUKXipzZI8/4Lak6Wiy/Sa2XrQ9K1AbWJTN+KutTkjuqajdzB2kKE=; 7:x+AZprFDDwBXL54brRYaBXfKHiU4gjHeNHXT7wx2XrmGSCAOT/Yt67inQPdGVCd//drEKUQsKqyPPUTlxIVwStIzd0mFzxG1MuPjX1rPdKPz1HoVvGTGc/5dU5bK7wcwteea0q/RlMztzhIiRRZXfzbZtZhTrbN/UZ4duEep4qSzuo8steQsL5YIHr+K1Gz5; 20:QYcGAzq47kllXCGpmIE+HrdUgOjaFdlV43P6CfAG3jWDI7I5CFR2UWhccwrx7Vw0aWJ/inu+C0vUAfUI4VaL0VXXDNh2dX0zjm81bFZwTU1IMISVyXPV8Vp39VqOBFsLEKw+k04zG924sgC1v/yB3mMP0QoyRuI7TngMzSlGLDc= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 May 2016 09:13:04.6807 (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 | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/rsrc-card.c b/sound/soc/sh/rcar/rsrc-card.c index a452150..86f3df3 100644 --- a/sound/soc/sh/rcar/rsrc-card.c +++ b/sound/soc/sh/rcar/rsrc-card.c @@ -199,8 +199,10 @@ static int rsrc_card_parse_links(struct device_node *np, if (ret < 0) return ret; - /* Simple Card assumes platform == cpu */ - dai_link->platform_of_node = dai_link->cpu_of_node; + ret = asoc_simple_card_canonicalize_dailink(dai_link); + if (ret < 0) + return ret; + dai_link->dpcm_playback = 1; dai_link->dpcm_capture = 1; dai_link->ops = &rsrc_card_ops;