From patchwork Fri May 20 09:45:36 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9129043 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 62F8260762 for ; Fri, 20 May 2016 09:45:43 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 53F6D1FF6C for ; Fri, 20 May 2016 09:45:43 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 4576A25D91; Fri, 20 May 2016 09:45:43 +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 AFDFE1FF6C for ; Fri, 20 May 2016 09:45:42 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1754760AbcETJpm (ORCPT ); Fri, 20 May 2016 05:45:42 -0400 Received: from relmlor3.renesas.com ([210.160.252.173]:44609 "EHLO relmlie2.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1754665AbcETJpl (ORCPT ); Fri, 20 May 2016 05:45:41 -0400 Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie2.idc.renesas.com with ESMTP; 20 May 2016 18:45:39 +0900 Received: from relmlac4.idc.renesas.com (relmlac4.idc.renesas.com [10.200.69.24]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id 774C952B25; Fri, 20 May 2016 18:45:39 +0900 (JST) Received: by relmlac4.idc.renesas.com (Postfix, from userid 0) id 54C1C480A4; Fri, 20 May 2016 18:45:39 +0900 (JST) Received: from relmlac4.idc.renesas.com (localhost [127.0.0.1]) by relmlac4.idc.renesas.com (Postfix) with ESMTP id 3CFEC480A3; Fri, 20 May 2016 18:45:39 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac4.idc.renesas.com with ESMTP id UAB03001; Fri, 20 May 2016 18:45:39 +0900 X-IronPort-AV: E=Sophos;i="5.22,559,1449500400"; d="scan'";a="211713628" Received: from mail-hk2apc01lp0212.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.212]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA; 20 May 2016 18:45:38 +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=Vgt8jvZ8RYIDqc/iM7O/Hiizc27IUI436UOyAR3TYTA=; b=UbQAgPCr0XFjMvwNmVkyibn+7Uhtt0yexwtx7pMz7RUNkXTur9TacF7ug4AjCtjyZYPfFDiGoGkHzN2Dqt0JkhwHTRVtX0izM+f3bIBaJnCt9PaK0NjXfh4eWn0ilIn9A/EoRRh46c6XO6X29MJ42dSDFKiXfYu7R2Db+hqWf+g= 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 PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) with Microsoft SMTP Server (TLS) id 15.1.501.7; Fri, 20 May 2016 09:45:36 +0000 Message-ID: <877feprrub.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH 10/49] ASoC: simple-card-core: add asoc_simple_card_parse_card_widgets() 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 09:45:36 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OSXPR01CA0037.jpnprd01.prod.outlook.com (10.167.143.148) To PS1PR06MB1705.apcprd06.prod.outlook.com (10.167.53.15) X-MS-Office365-Filtering-Correlation-Id: 59287013-55bc-4921-dd8b-08d380937f27 X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 2:LH8HnlF4w/UwfXOp4gxtmC0I9HlxCaKDrbvnGw08pnKAJBuT+Ky+CXfXjSdHmUqdFPQH2pl0KQhsbvAogaMKTuhmubLrcQJCNYnxLIel1Inj4BLOLgB5LNrODcH1cnPEvRfEnV4kRKV4r/7Ro/yKOiUvQ18d4z3HouyUoGK6Hu0PK62Nl20dzvQSy20Zir8X; 3:82w8voezBR39KiWfIi/b6m7n0H41gTT9d7NWL+a9mHk3zY4DrVTWJKFxNXA4USROOlvMzzMu2lPHZsybYHwgXltYrypAwoa//SZCda0KH6K1JXFpOYWgodKUrj6mE/GD X-Microsoft-Antispam: UriScan:;BCL:0;PCL:0;RULEID:;SRVR:PS1PR06MB1705; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 25:dvf+bMbRSjpm69pzLN/g5TWGUR42VNin7WdWMv94Ep1vYDtQJd5q7q0E9/rvFNE/pImF0YQ06n+rNlDOz3j59XEf1IRuCr5dGXN9vbqXW0p4nWIJ76jykrUvp198nQPmAnsfScayKPFy9xTPuwnXkPY/pENfZRbup1Iyve9xzlrraq5QUbQLAoFKYke9+4f91k3qmfKod5z59J9F8OwnhcqhYlXcsmE2OYS4hDCBpDMn2LGjJPvYioNkbViKL68TSZWqvyPwmsVDmfak11J0vn+GhPcG13vo/pzmPkPknvpj0a6hi6Ns3SPc5v1xZs0PAncavVrgrRUudzYFjpFL2w+BKISxNepbzDuIwwBmgblK2ctqO5JXXEOHlyOKktTAhW/0rKluU7AWkmK8jCS95frn6zumL/D2zEXv7Riq+w5QQZ5h3jjQmF2S9pTGNk4I1mjs8S7jtDtTNn8VWaNs2by4ichQyMgfQ/OIUXqr4Fwa+HAavr9o/UngyZHJHqQLqYzjjlnlzGQ/PvxeL2aW3R2RKG7UkjPDusLGwWhuOGASU1GPdzX6mbLf6y0qjz9v5sb/yKPcfBWLkdAm19nqbzPynKo1QloURvb2qd7e2ENH9Otdx5eudSftl5IG0fxONbFhBIXcOpydg+46JOz76yhU+hkZeeN3ObXTxxBCrmz9LJUdO7dYT1AtJH8Es1z4 X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 20:qn/FNgUF8xgixfJZc6Hi13rE4Y6IM9V2z2V8gwYfVcJ0CodKJI3ZxPus6mrxJSsL+LeNVo6MptRpRexI1i0b8/WJL/WjqI8R3ndQufdQsNTiNBbVOdWLzj+kjwLO7+bmcgqFRJo7GP6yUJyAPagnbbL6MxW+hDEvrW3b5WZC+26XbpnkXfF2TyiPI/w6iKkW5hXTPlQj1uI5j+AAL+gMM41W58sdDjZpTnwNOPzRHSQCGdT9lPeDTgZsBrhrqJNxnkur7bHvAQN2WbAwe7OVkQrgePaybVJwd6oBJdFm2iqlTEx0ikj2BMr9pj+OsJIObGuyEMZKhNyorSk0mnx/VAEJqoScru58JJDuSY/JwdYqqQOwYLLWv66UgA7RUo1xcWyBXEhGdJU7z/BRWjp+XBubKVjP/dtsSAFXz8LH/k3yjzIOmAXsEOQ3gBpnUCi+x5s9a76fXh/drF0aAJ+TVyTm2OPOwHtoaC2MJD2C875t83pJlrUIk8FaH05Kq4vz; 4:VFTY9lBTbdld38sKIXpWSi/moUxzgKe/ntnicXmpB8Mv4H2d+ps1Vf6ncL0uWO9J7qGqJKCne5CYkskeqgi71lnB+OMORxD3UwNu7cp3qTZdoPUDajXt1NgdU0Ocr76IzGZyKWu+ScXlCtdC3oCHGWouvOpl+IAYp1G64spHP2623/v+m/88QdxQh48+X99FciwBbtIQvSIfzJYymMFl7aOkMx8CPoOC/aYSQcBIteLE0X0+KfnXbJW3lckrV+mjyQ5QesgSpmRFWJ1ByBDdhd7YnwMY1SleXyDBYn4qRX/CwhBoTvUIBUflUN47wnK8IcXcbeFFz+woM6l0GJBDrn78LfCNn1AF61hF7ilPXqhfdHbh/LSpaxFZOKl0LqVbZntE6SywdsC0d9jO5jwZDQ== 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)(10201501046)(3002001)(6055026); SRVR:PS1PR06MB1705; BCL:0; PCL:0; RULEID:; SRVR:PS1PR06MB1705; X-Forefront-PRVS: 09480768F8 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(6009001)(46406003)(4326007)(5004730100002)(5008740100001)(229853001)(83506001)(33646002)(23726003)(2906002)(3846002)(6116002)(50466002)(586003)(230783001)(66066001)(47776003)(36756003)(2950100001)(81166006)(53416004)(8676002)(77096005)(42186005)(110136002)(189998001)(92566002)(86362001)(19580405001)(19580395003)(54356999)(76176999)(50986999)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR06MB1705; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 23:RDPGufOM8AwgnaBIqcXo6Dtd7s2oZU7NTK/izO13ts7TsW1Zt7Mc1zuD7QBCpkNOOndEmIYqWTUxkY1tf2dv81U4+wo9AoEuiV/SAeBiTQyT+Y0KO5/tcSSUbExNvZJor5QPnD7LJpp1WmGqOYm0YghTUj0wCIaXnI2CbIcjFInK882b0m5pz990Xw+niSOiCJyAQxcWR1OgvEUI7fh5s2h0MPLO8nUn76ei42zYLzFpTuM93KdNbJsAwSjs5qGGMyPjY7I6cg7eBdqb1Mfg3GGkKQk0FtzXSfyqGOpMPQvLFSuMGTrxcDnV90mVp9WeSylZz+z4lDQQ2zY66flS6tAwlI2K7ovHZz2dyoPUNr3J4YmeyZr0R/w0lY80Ed1lDEuBXj8xvKQeYQVPRC2RYDMdfvZC1EzFtoYlE9scUIWGm4uwiBg18H1QNgPlqo4MwTN/A/lDvr3pb5w4DfUqgpfjkDoFMVibIIYANE9z7egU0T50oI+pvC01bK5DO736nLWedS/KCR/BPa2cAq2y664lxJIhJG6LNWwG6zOp4COC/OoAVl7r5tLA2TzjQfeamxbX/Rms9lK/A0X/gEpO1w3IGaf1aw5O1JoH0F4koz6QwECbHczHOi9r1XtXPqYHaGZPHu3fj44adNWuEYYsNvmCzXU8AnztkYDoI8sCDj0BTR8ab3aJruKlBBSEN4JxP55b5/wsN3/rvsNQ6OiUOkqqLi54PurFJRY9FG6FDY7NFUB/cD2M1Iee3L8T+/gdgXDLn8Jj/0BYBYF2mfqnAvWqtWPIyfHcHJ18AyDsOIJ9eRA40fxshPBqAFC52eY57dDORsT87iHJOiiyf/LtnxsRG8dqJAQcNG4w8CQPNp5XpZohj2YwUl95EmIkXDs7PFCnZlLznjCkQ1aXalVTuA2Jk8ZnwhVQfFckHIaWL Vo= X-Microsoft-Exchange-Diagnostics: 1; PS1PR06MB1705; 5:UuBVXp4G1/LXlG/MYa5Mk99r9mctGGrZVMcyOhxw8HhhmuZGwiXf/O4ZL1gchYkNxLAd48rk81VV2tF2rho1DOLLuUBORCt58ItDZRiAuGyJrggDJ3DWNjqaUmut7em6kgUjULd/1iM1SCyUPnS1/Q==; 24:2EfN6TJiZwa3jJ9MuaLKl73QlYr7Z+yvPUQOGE7UWiGqDSSDwhj+X73dTAi+mp8CQrff8I4Xq6bF4CvXTZJFlizNbG38HbENg2FSjVPtrPA=; 7:1jf18edE6mXq/2Sp4GWZE5TbYvKOqBWAIDlSE90bHwlgRSxJLRAXkfRmeI9/AGiqtyimXcDwVVwarKt4jAJA4MH/NLpVHvF6rFwjJNt0gQOEgu3/HjpqqAuXGg2NqJDeflLIkhqLXQL/bj6vRr6kiY715tjZ3BsVHrkR8fjlu8NdfAsX5dMSWN3BLxL67bLI; 20:V7MQ3I1fnF2mU8P0j7qjDvbARjie7LZXKl035GiiUazXjKipAwnvkD0S2CUe1unLF+vQAEDyPNLpTmrbNSRd5Q+Xf7am2bQEm/pd6XQGrPNKC2Xy2Ww4SKYRMuWB+18rMKeyzzvYujutNBMtGzhyQHdlHmMqNotcqRFlbxbion0= SpamDiagnosticOutput: 1:23 SpamDiagnosticMetadata: NSPM X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 May 2016 09:45:36.6551 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR06MB1705 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 simple-card is supporting widgets. This patch makes this method simple style standard. Signed-off-by: Kuninori Morimoto --- include/sound/simple_card_core.h | 2 ++ sound/soc/generic/simple-card-core.c | 16 ++++++++++++++++ 2 files changed, 18 insertions(+) diff --git a/include/sound/simple_card_core.h b/include/sound/simple_card_core.h index 89172aa..d66b536 100644 --- a/include/sound/simple_card_core.h +++ b/include/sound/simple_card_core.h @@ -37,5 +37,7 @@ int asoc_simple_card_parse_card_prefix(struct snd_soc_card *card, struct snd_soc_dai_link *dai_link, struct snd_soc_codec_conf *codec_conf, char *prefix); +int asoc_simple_card_parse_card_route(struct snd_soc_card *card, + char *prefix); #endif /* __SIMPLE_CARD_CORE_H */ diff --git a/sound/soc/generic/simple-card-core.c b/sound/soc/generic/simple-card-core.c index bc1f2a9..bfe3bf4 100644 --- a/sound/soc/generic/simple-card-core.c +++ b/sound/soc/generic/simple-card-core.c @@ -142,3 +142,19 @@ int asoc_simple_card_parse_card_prefix(struct snd_soc_card *card, return 0; } EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_prefix); + +int asoc_simple_card_parse_card_route(struct snd_soc_card *card, + char *prefix) +{ + struct device_node *np = card->dev->of_node; + char prop[128]; + int ret = 0; + + snprintf(prop, sizeof(prop), "%srouting", prefix); + + if (of_property_read_bool(np, prop)) + ret = snd_soc_of_parse_audio_routing(card, prop); + + return ret; +} +EXPORT_SYMBOL_GPL(asoc_simple_card_parse_card_route);