Message ID | 87pnxzkzjt.wl-kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 868cdb4690699b04ca4d09b1e0178dfc680dbd8e |
Headers | show
Return-Path: <alsa-devel-bounces@alsa-project.org> Received: from mail.wl.linuxfoundation.org (pdx-wl-mail.web.codeaurora.org [172.30.200.125]) by pdx-korg-patchwork-2.web.codeaurora.org (Postfix) with ESMTP id 458B6920 for <patchwork-alsa-devel@patchwork.kernel.org>; Fri, 31 Aug 2018 04:00:11 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 32D6C2BD41 for <patchwork-alsa-devel@patchwork.kernel.org>; Fri, 31 Aug 2018 04:00:11 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 265E42BDEC; Fri, 31 Aug 2018 04:00: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=-2.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED,MAILING_LIST_MULTI,RCVD_IN_DNSWL_NONE,T_DKIM_INVALID autolearn=ham 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 45CFA2BD41 for <patchwork-alsa-devel@patchwork.kernel.org>; Fri, 31 Aug 2018 04:00:10 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id F195D267951; Fri, 31 Aug 2018 05:10:27 +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 B7368267951; Fri, 31 Aug 2018 05:10:25 +0200 (CEST) Received: from relmlie2.idc.renesas.com (relmlor3.renesas.com [210.160.252.173]) by alsa0.perex.cz (Postfix) with ESMTP id 04369267961 for <alsa-devel@alsa-project.org>; Fri, 31 Aug 2018 05:10:22 +0200 (CEST) Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie2.idc.renesas.com with ESMTP; 31 Aug 2018 12:10:21 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 822196B145; Fri, 31 Aug 2018 12:10:21 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.53,309,1531753200"; d="scan'208";a="291133171" Received: from mail-ty1jpn01lp0177.outbound.protection.outlook.com (HELO JPN01-TY1-obe.outbound.protection.outlook.com) ([23.103.139.177]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 31 Aug 2018 12:10:21 +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:X-MS-Exchange-SenderADCheck; bh=Jo4zbBqOUh8cPjsDOiOf/ATOCBXpm7wKRHhvi7Qcbso=; b=lMMdKfJf4dTjhX0k4mRp/QwgSiy6dbWTTDVn5tMUiMMAnD78o9hw0I0rBxgRVD1ciFCc/2g0oiXJ8AxJyINSUt1OjEGO/d8zqEBbH08OGlgyp4lmwn+1mtT19W5271vAu709ranxtIyUuYCqh5jmOZ5jGuYv5Nzy+6BueW62l5I= Authentication-Results: spf=none (sender IP is ) smtp.mailfrom=kuninori.morimoto.gx@renesas.com; Received: from morimoto-PC.renesas.com (211.11.155.130) by TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_256_GCM_SHA384) id 15.20.1101.16; Fri, 31 Aug 2018 03:10:20 +0000 Message-ID: <87pnxzkzjt.wl-kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/24.5 Mule/6.0 To: Mark Brown <broonie@kernel.org> In-Reply-To: <874lfbme8u.wl-kuninori.morimoto.gx@renesas.com> References: <874lfbme8u.wl-kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 31 Aug 2018 03:10:20 +0000 X-Originating-IP: [211.11.155.130] X-ClientProxiedBy: TYAPR01CA0060.jpnprd01.prod.outlook.com (2603:1096:404:2b::24) To TYXPR01MB1869.jpnprd01.prod.outlook.com (2603:1096:403:b::22) X-MS-PublicTrafficType: Email X-MS-Office365-Filtering-Correlation-Id: 39f5884d-5530-4661-d728-08d60eef491d X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: BCL:0; PCL:0; RULEID:(7020095)(4652040)(8989137)(4534165)(4627221)(201703031133081)(201702281549075)(8990107)(5600074)(711020)(4618075)(2017052603328)(7153060)(7193020); SRVR:TYXPR01MB1869; X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 3:7a8rOc75CsQPJRCX/oE6WJvnYeX0wC8Ih16BpEne5mLbx6GuhsAVQZf+o6QvkJaWRQLTXvD6s/Zp1Q1eyTYrkWic0dvMErhzsJGWKVJzMaSxTp+fTaoUf4JmbP/gOINpJ1IFWoq9wdVJNA+N+jjI3yMTpLovPQdw801Lwf13TsLOVkSvdtK8120EPDjeNlqU3hhC8rdbvQEDZx0MSq0S4PM3Uy0B4iWuS4SUhxywx/64o998fBxFA2ylKNLZNldN; 25:tOrMYbrwB88PBV87OIkLywbWO8zPY+DQD+72qNrg7XCO1FjrZ4eqVwgAFxyIlRTkyxVUv09v0CgOk6LWM31OKrEUDjcY7+k17MhMQ2PbVKsGdQY0JorHx3eKn7nI0jM0ucoLRgjWgvY7EoaR5Bwro7xCtW7NxQ1fovZGTAdxCsR57D3ncLAhTa0XW/uk0XLry4aFFGKu422qiTrUxSubo8aG0jKTSbFWIEZ2ksWoy83W3t75KB0B5wOaieK/SR2VCGCc8qM+oWDSlLN9qSGScuMnV+7EGI7kZ5ff+tkmBzP2tIRkpIajk6UPCx5baQ7NIKshP3pSKa/EXi4ecZHf4A==; 31:fJVUYAJl6Cm9m2njQ91GmNeJ93a+/8PFJoKjdQ59OHqyLiS5Nr7whWygInm+CL4eoIrK9VsBAhYqZZPvZhfAuQqlvAIdF2jY9r5Hfp/kQyisvCkIsABj5kQcSZFqDWDp85SYgmh5susMQtXxIFT3ri73DZX/zAL62PB0HIb6UP11vDd4Ru1gXhM/DsoG8eiwT5g5L5bF/vjaiaBAFWy2eOfCQQomXQ0oRu/mfKZN0U0= X-MS-TrafficTypeDiagnostic: TYXPR01MB1869: X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:jHq74yTnzB6n83w0Ju2bFsNWvH7WdiibwdgFgPgYsrAOi6YuN8lIk5mmq1fJDueH77Mud8CkKy8X/b8+BC6Mu5C/BzNj8I7cT6rrbelnG79doLPRH9UH0EXf+KHAtNJhApQTJz4euGNSfNTrbp/BiXDVisH5z1WYxiSeR/XiYGJ/hcX1cpm1Aly1CwT3yY2a6pxKGzxQz8arHjVDlVuGF59mN7xzGJTJ+Xh26B4WZznWiTEchmEwzeDYYujKgxx6NSZMxjLlAzbQLIlBvZYFh8IonVbt95zc8Q0J8pgjz7cMdaNjgM+sZLRKBF6H8Z7TpInVv9v1iLubtln+H7DMQiIFy+nCaMqKNKSKzY/idro5XadJDnspbwjlNpVkYXrwJ2zNBRZVaz0BEJsud6l2MQ/Jr43CthnWs1zh8fZRRcjm1J8t9ZVA7cl5MpvxwHB8GGl8qkVAnX7PvShrsFv5NADdaF1bhxX6HjVGZDtLvutkD9t3gkauDVmTqtxulgqk; 4:/DkUd7lLK5b8Yyhzt2GM0j55p0PU6OVA1IR7RUjFKHQT5Up6Fl+EUXzQ3qVx79BPRYW9Ycxb6+5KrslK8tOAmtUdOHLql4Ldbe2+HOXG2erIO1ViFIUsBQCAIQrpRis7nNNfZVN3oAXVq6B+Cz25Gg/1XjfpUcfA0B0YJj/oNQ7JaLr+aqGjrnXDJIhwteTWGujCviOEnN1dYyFpgyi59WJsX/aF2VhFNBv+L0sExvTx1GlHf1CG2xxPj+c138R13LywlOqotz2X6aIPV4gPsw== X-Microsoft-Antispam-PRVS: <TYXPR01MB18693D106541DEC774DF733AD40F0@TYXPR01MB1869.jpnprd01.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-MS-Exchange-SenderADCheck: 1 X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(8211001083)(6040522)(2401047)(8121501046)(5005006)(10201501046)(93006095)(93001095)(3231311)(944501410)(52105095)(3002001)(6055026)(149027)(150027)(6041310)(201703131423095)(201702281528075)(20161123555045)(201703061421075)(201703061406153)(20161123558120)(20161123560045)(20161123564045)(20161123562045)(201708071742011)(7699016); SRVR:TYXPR01MB1869; BCL:0; PCL:0; RULEID:; SRVR:TYXPR01MB1869; X-Forefront-PRVS: 07817FCC2D X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(136003)(366004)(346002)(396003)(376002)(39860400002)(199004)(189003)(53416004)(16526019)(186003)(26005)(4326008)(50466002)(53936002)(16586007)(86362001)(81166006)(81156014)(52116002)(2906002)(486006)(6916009)(7696005)(7736002)(25786009)(105586002)(106356001)(47776003)(305945005)(11346002)(97736004)(66066001)(446003)(5660300001)(316002)(76176011)(68736007)(8676002)(6116002)(3846002)(386003)(6486002)(36756003)(478600001)(956004)(8936002)(58126008)(69596002)(23726003)(2616005)(476003)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:TYXPR01MB1869; H:morimoto-PC.renesas.com; FPR:; SPF:None; LANG:en; PTR:InfoNoRecords; A:1; MX:1; Received-SPF: None (protection.outlook.com: renesas.com does not designate permitted sender hosts) X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; TYXPR01MB1869; 23:HBIymXB+vE+fRMwa22w0QxBgAYB7xbnk4EJJ/VyIj?= CQgZMZD+DGqKgnV+E6Q4RQ8XcCrj5OcN6E3zZ7D/jQ4ah1L29jwXUuj6tSanUSIiLKk1mZ0B2tXMzUmrSEdINHuSdO+IgbBYNaW+5MzNLzAPaIWwEUYaA2BnZS8xhuJQK0icDlZycpDpID8K1Uo8JOnXTVWmy6qG2m8X/1Ad4UZbMKApNY1SAcN8t8MhQj1ZyTWgjg0fKA1S6RSVWBPfE2rNV/M/Bio8LnsScton0ob5Frr6bO3u3viAIXFrqwnAwInrUm28UDYdO/nEBHpUkzdajaDoXeO2w0oXysl/oeU7RHFnytK0aRY3ynH4eYLMZD5HSIGnvYf4J+gD3agNiGRK3xDEm2kOjIOHqIo067p8aInVGagrm3uqLegY0O+7lDhYDRdVMmI6rxyX6f9UUErc6hOaDzStwzuOmG4w9KU55pgwk3/0jQO/CuZXfHOH63PdQfaZgxAURotIHgiHNqGhIgvmZHC+sfYvtD1gcLzrI4Z6AtzWPR23pYjtRm+7vSH3dwA/4PomYeA3O0aSKs9g6RrrjF6WmxDv/h4Rnt+KjyVVdRJMf6wEXm+rEtr2HMTHV0AQUKTgKCgN4HykE3f+WatPVvyoFu9W9BYy6vsjC3ZRrg3n1+1JLHTw1Uc6F9PUlqZRoMDzKXmAfrSwUi7f/xvjuJbBub2r53SWsUbX2Ju4vgiUkq639YSOdpNZRGnMO753UmmYvBYVyQyjENVth7q35Lr4dIjFRjZH8TO7tIf/KePBFyL9/hjTm/gPReeeMeEnTcfJCBRgRbMkF0zi4dP1NUjL8+hoWL8IxQIyaLhuYCT57pLPtzCO9C6bsz9pQcrHp4d0Zw+gRdA/vAXBFNfhNGdUbzPyCMBvaqs8uHI15P7u504bCkkGEnQ6JYsqyvv7P5zzHfeFSF6VkmIsGS1yzRfC5g8MiFwQUMfLa172CIXw+oUZ9rx4Pa8nwfOxmbP4uyRlsDqKKBMp6pKIDfnszVAZCIrj1czB4VwbGeRZc5Mqr04+5WTFYYoB0coDILl/7rjtHcXfYPqSElEixEjlKf2mSVBpcUE6gU486pnytYMqC4NEZDCvc3K0+8zeDZQNV8tE3QXuaJRQ/GnGsaVr/eriOYGfEqy1zE+IKq7mQkgjvoqyXgCEc7en6M= X-Microsoft-Antispam-Message-Info: ffZ3CacPY4yRTRDq+VBo7b6x8W5vaxTTxECUonxztEK2o7PADSYwGB85NstWBKCT1NX1hB1iZG+Aarx8FI52rSSE/iaJCfe9uLzesvEerpv7rgSrcTSHUPp474nqPYaygx+2p44RwrhQbJ3HpYhsqcqpAX/EJiE0TT4LpMNDjYwVOpe186zbb3F5QrSnzsTa6uaMlER1fXk8BDs/EuLF4hLT2qoakXyumSNaPJB/wQWFng0wv6HdwilljOyT2FNUoAw7Qe2HV42CgBbKZiRm+0dLRqAYNiKRIf6zCCfJhg5R6cIoMVMFcql2357/6czDPpPy6tkvRw04Dsull8RhxfoW8Rt0K8BCJz/Mu2TdZlQ= X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 6:7mHds4gSOxZIP9L4ZRJIKwVeHIYtNl+78TVHGPB1LgN1z+o07lxmj/N9gka1TAWSe57xOhIub86iLPb2lzRudTNMM81+xbdXS/7sZIJVssjH31q7CTBdkcA0NdvCZj/jp5RvAE8hnxeRXMnRfH65k+4nBLZl2X0vMLlyQG5aw03Oh/7i6RQsw85PnW8/yR2elhx40ZcqraFNE9bv5FKG/raTQ4gaLFOgZWkB7j0UpGJ1VkKU1simfeE0xEkAum/Yr5jm5aTKksJ7NLjhqS0lKdNawbXtebXnAyqMc1cZ6WC2Ix4m6q7pRvXBRCELuo/+onMeMsTgQsvOh/Ysuaf7m3Tjpk05Pq8lr524KZ3fel2LdW1GQoWD8ne3MfEZqL6hi7LDzA7egGxG1spzdrZTO2e9Cn6096oFZpfl/6Mhyks5Al3sq89VKLmlPhhxL2b4QBxSQpxIzLuOFlZYr87Auw==; 5:juKL6a+iN0Su1G8Q22stInebEL/c0Zb8ekE61K4pBRPsamiozg0fnquZO0ZykjoDO5JQQfsjxkHxrtK2IuPnjH6UIlKpAHblHHlFMs/CQNal414HEdEzpANVrk+bT5BMmh38rNuDkM9CuZVnas8hazOY/H2KAzklaEmMyKjL0LI=; 7:hFw+ZUlL6mZlLzOSnYQbQNDkv8Y5lK6JncmtrTxm1exxjQjVDIVRN0TZa9nP2qf0M6byPgexupas+/DlUBt/gD66c8GkxxjeOYOTUSdkxMXV/cunMhB7nfi65yZnbR6DBSkvG0MoAyoZf7Wt2AyDqrSROJlSGV9CZUSWGRBs/tU+osZx1zN4qMU51FZeItrk6A52qc6XsLlhnIkjXYy6G+7xyP1a1ytXLzUgBH8YcNyn/CvtlVsHt6ZQEE3AuXk9 SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; TYXPR01MB1869; 20:LLOYU9GEM+Ke3UDgDJPahosQwIxS7KM2lmN8vACC1jDivlOn/bzAsOnRnK5n71csQA7GkoCmUcLetvqxXy/oP6hY6326H/AxjFo9QPAfETlRRHfrZrqFgX12axF1j5SPkLEQL7LXOoYyMjfIrN79Izwqha84B4TKu9Cl8CKyU+s= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 31 Aug 2018 03:10:20.5700 (UTC) X-MS-Exchange-CrossTenant-Network-Message-Id: 39f5884d-5530-4661-d728-08d60eef491d X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-CrossTenant-Id: 53d82571-da19-47e4-9cb4-625a166a4a2a X-MS-Exchange-Transport-CrossTenantHeadersStamped: TYXPR01MB1869 Cc: Linux-ALSA <alsa-devel@alsa-project.org> Subject: [alsa-devel] [PATCH v2 10/15] ASoC: simple-card-util: support snd_soc_dai_link_component style for platform 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" <alsa-devel.alsa-project.org> List-Unsubscribe: <http://mailman.alsa-project.org/mailman/options/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=unsubscribe> List-Archive: <http://mailman.alsa-project.org/pipermail/alsa-devel/> List-Post: <mailto:alsa-devel@alsa-project.org> List-Help: <mailto:alsa-devel-request@alsa-project.org?subject=help> List-Subscribe: <http://mailman.alsa-project.org/mailman/listinfo/alsa-devel>, <mailto:alsa-devel-request@alsa-project.org?subject=subscribe> Content-Type: text/plain; charset="us-ascii" Content-Transfer-Encoding: 7bit Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP |
Series |
ASoC: use snd_soc_dai_link_component style for simple card
|
expand
|
diff --git a/include/sound/simple_card_utils.h b/include/sound/simple_card_utils.h index 3b5bd6e..fb0318f 100644 --- a/include/sound/simple_card_utils.h +++ b/include/sound/simple_card_utils.h @@ -75,7 +75,7 @@ void asoc_simple_card_clk_disable(struct asoc_simple_dai *dai); &dai_link->codec_dai_name, \ list_name, cells_name, NULL) #define asoc_simple_card_parse_platform(node, dai_link, list_name, cells_name) \ - asoc_simple_card_parse_dai(node, NULL, \ + asoc_simple_card_parse_dai(node, dai_link->platform, \ &dai_link->platform_of_node, \ NULL, list_name, cells_name, NULL) int asoc_simple_card_parse_dai(struct device_node *node, diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index e7057be..644cd62 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -376,10 +376,15 @@ EXPORT_SYMBOL_GPL(asoc_simple_card_init_dai); int asoc_simple_card_canonicalize_dailink(struct snd_soc_dai_link *dai_link) { /* Assumes platform == cpu */ - if (!dai_link->platform_of_node) - dai_link->platform_of_node = dai_link->cpu_of_node; - + if (dai_link->platform) { + if (!dai_link->platform->of_node) + dai_link->platform->of_node = dai_link->cpu_of_node; + } else { + if (!dai_link->platform_of_node) + dai_link->platform_of_node = dai_link->cpu_of_node; + } return 0; + } EXPORT_SYMBOL_GPL(asoc_simple_card_canonicalize_dailink);