Message ID | 87h91mxww7.wl%kuninori.morimoto.gx@renesas.com (mailing list archive) |
---|---|
State | Accepted |
Commit | 5711c97920377827da4bbc18233ffb08c6e3bbef |
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.web.codeaurora.org (Postfix) with ESMTP id AF48C60375 for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 18 Apr 2017 02:43:07 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9F67D27D0C for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 18 Apr 2017 02:43:07 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 90D2427F07; Tue, 18 Apr 2017 02:43:07 +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=-1.8 required=2.0 tests=BAD_ENC_HEADER,BAYES_00, DKIM_SIGNED, RCVD_IN_DNSWL_NONE, T_DKIM_INVALID autolearn=no 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 96D1E27D0C for <patchwork-alsa-devel@patchwork.kernel.org>; Tue, 18 Apr 2017 02:43:06 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 5E246266D0E; Tue, 18 Apr 2017 04:43:05 +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 3D7B8266D2B; Tue, 18 Apr 2017 04:43:04 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 9644E266CE9 for <alsa-devel@alsa-project.org>; Tue, 18 Apr 2017 04:42:59 +0200 (CEST) Received: from unknown (HELO relmlir2.idc.renesas.com) ([10.200.68.152]) by relmlie4.idc.renesas.com with ESMTP; 18 Apr 2017 11:42:57 +0900 Received: from relmlac2.idc.renesas.com (relmlac2.idc.renesas.com [10.200.69.22]) by relmlir2.idc.renesas.com (Postfix) with ESMTP id E5615635DB; Tue, 18 Apr 2017 11:42:57 +0900 (JST) Received: by relmlac2.idc.renesas.com (Postfix, from userid 0) id D185228076; Tue, 18 Apr 2017 11:42:57 +0900 (JST) Received: from relmlac2.idc.renesas.com (localhost [127.0.0.1]) by relmlac2.idc.renesas.com (Postfix) with ESMTP id CA1B128070; Tue, 18 Apr 2017 11:42:57 +0900 (JST) Received: from relmlii2.idc.renesas.com [10.200.68.66] by relmlac2.idc.renesas.com with ESMTP id MAF24292; Tue, 18 Apr 2017 11:42:57 +0900 X-IronPort-AV: E=Sophos;i="5.37,217,1488812400"; d="scan'208";a="240861841" Received: from mail-sg2apc01lp0241.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.241]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 18 Apr 2017 11:42:57 +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; bh=dD9WjYX3R4tFgI6pwC3n9ILuCruti0HpF+h7L07DGW4=; b=CEXX4hXwPEclyWBv8Tpksqtoi+vS1Qxm+4I6gQ2mKc6/2Ft02Q6gBAvWVgY4Pl5fbku2K8cT594i2XiBjnlyiPFLn3d508e5UIGysC7X7cMloK74YLFmbsLiaiU4wg2KbbIhTAtGVh+gOu8U4MMpFJmZ6MxY3eDryw+FeozI/ao= 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 HK2PR06MB0820.apcprd06.prod.outlook.com (2a01:111:e400:521f::15) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Tue, 18 Apr 2017 02:42:54 +0000 Message-ID: <87h91mxww7.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto <kuninori.morimoto.gx@renesas.com> User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown <broonie@kernel.org>, Rob Herring <robh+dt@kernel.org> In-Reply-To: <87o9vuxx4e.wl%kuninori.morimoto.gx@renesas.com> References: <87o9vuxx4e.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Tue, 18 Apr 2017 02:42:54 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: TY1PR0201CA0030.apcprd02.prod.outlook.com (2a01:111:e400:5971::40) To HK2PR06MB0820.apcprd06.prod.outlook.com (2a01:111:e400:521f::15) X-MS-Office365-Filtering-Correlation-Id: 7956597b-d2f5-4750-07b5-08d486049de6 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:HK2PR06MB0820; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0820; 3:6I74CQo2EQN4a+2BVyUXH836QJOzuj5A7yP1W5yuFKqdQ1KHnU48rRdMB/1MEhKXwJK4lIAsy+MPC7j215dmwgjrW0SV5g3+K3Q0qUDFiOaa/xQ02tGIzp9FQojfu6ak4IwYn3Hs2HUejYCbEeaeBw8bC8nzuWU//tKbrLEGaUbBiJ0KAAmGvXC3BRe63kmGT8lWoIp4tsWpxWa8By5HMKnfNkBVYdnKOk6J2833AoIMG79yfPmT8HAhIYiqc5gY9GeKTRd7EvQG2Hg9CkezHNW9ynFeOYSqBvlnAlwuYuPj54bkw1BSgrLi8uMqHuXexXsOKwqHNFd8/1jwdztV+MGqwKSDWvSh0i6pBlJUQ38=; 25:C7c5RGS4UDhYg9xiBIi+T7M2b+LIo6cANRN+jTULT4dfurecHhGXchl47oJqWPnbsH69qnmOkLZpDkfC2uMVHP2G16tN+2vyNbU+XmVs0cSiiTBrFcS++vjSJkw5U89pkmUb/wMm75l1BDXl5yO8rTzLxVA0wHDGLaChdettmxnmf6Y+Toemyal1+gVNRGErVkjvCPrX9h1MMs8vGDwbUGOwnJ/Zh9/zcxxiDFsHjK4ABLKh3ZzVvKmHZuH33MPffR5+5rqyB9tG99BHpa/4D7I6Dqxsgl14ENKuPNOkjLmZxa2rIMb5qnx9iF3G2+53VDIxEu1QiVi5KjfE9Cs2bHxCGCMwTDm5MdI7GGCLCIm15wFVOF+xYIhRY8P/LR8iuk5VpE3SFGWWmnyAGXeuU02jZQ0gAWLjeHX6Ynv51gOmNLcobNStllXL/q4+2cZTYK8pWApnny6EWKqUabfg7Q== X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0820; 31:cYQxnTtJC6nAVRHSQ4p2kMPAg3PfOMLycPAO76vx6Zc45x2CiKe02HQDhQvOS5ME9EPn0bmydYD06N0Y8/Ew+0NeBGkhGaImXFjtmSfVu34geE9hVVau3Ze+KUPpruujm0hFLpRBILwxbW6CkGBlsEM/0+3M49IB2kxUTtPnm5v/gFnoUqOkWGtsN4emLAEVTZ/POZDp+JwFkzXBI/xI4kaGvWyFgEL36F68KbEhKZYXt9OWw73xgbSfmuhplzi9d/e8PrHOe3CXYDIfw3yQ9g==; 20:EXKijm+ovnxmCc0dZ9Yw2F98S+OW1QD73F/1GGhvWk29Fj3voQ1ZYOw/1NfWHk9Y8gbpMH/LcrPIWM3Tiglw35jhD+loXDdtI3Gj+WArY+JTuJNFV1zIbybKTt2eiIhPA5HcfHCK5g4fIcY57sVO1iMNT2Hiq6aBl6WXRMCxJNDwyVht1O4ZW6Z6vOBiUayAy7r/N/uFc6qWksBUSaOsJcisWu3DKwh5+PpMVHLc3kShUwjELYWzZMm7Z9QtzDvmQwZYqjjI98jkghki8cOArhdm4MHQ762V4t+Hm3JG9oS/fgbp2jQFjiBFwjwBqL15ZvvRhtX6LpTn7ujGzn6le8jYEwpWn0tNLLIjA3UCZh8lJlJEEg65qi4i9Wm7vi4h/ywFq1/YNzPeeTLamVOHxqyfSrBMrAzWie6a89NnaVKe8c2MuVawi/6yXCyXCSu6n77vAQVHhQl1nA2JCN39FXBG0/53LwDAHxaVoW5FDRGEgGKxn5E/EKao7CjdXNCj X-Microsoft-Antispam-PRVS: <HK2PR06MB082098D21814FAEABCA7B5E3D4190@HK2PR06MB0820.apcprd06.prod.outlook.com> X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(93006095)(93001095)(10201501046)(3002001)(6055026)(6041248)(201703131423075)(201702281528075)(201703061421075)(20161123560025)(20161123555025)(20161123564025)(20161123562025)(6072148); SRVR:HK2PR06MB0820; BCL:0; PCL:0; RULEID:; SRVR:HK2PR06MB0820; X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0820; 4:4t4Kcr48HPFCuUAmtmdQpdr0UKKq31iWco6bg9CCocsbAZHduWggW0R3uIhGmQWbA4HfcI+IYY8uQ/hAA9mbNtp2AjQ8qP/skEZPsITlm4IP3gNIbokTiR2Ski5d2vZ/C7rmMc/8e4MzZg1H+DA2m/jEkZ+F0BmSJh0wMoZ00Dtu77IrCUBAyjW6cGfzrbAMBxe0jy1h4O7Zalm9yX2GRL6lx2wFV0YTQ+PqWZSrP5z5AXWHBhqOnqYS0MLkNWkTBWQgC2NsrGcSy+Ecn0GYBAAE5TPeRS/1ztTANGcGQO5m528BXjsun/kEDL9xC9VRyjJ5Qi8oNYhF0SPMtBJkTdYtV2j8DCXf3cKhP8EQzgu6++a5coErsWAAO8WOzSFOMnFJACLESFtzuGJG5lmkfro0pM1N9kl1U3kLHCbCgwy3tGnw+qV84OtOlML+hs1Wq1ZkCXxizr/jumG4KVLyxlHFQUQiu20WW68G83dwC2B1fhP4gHr4PggX1huhWQPc73zQqkNes0wbszktOKAgnVBr/W2b8qUUj9fHH6ZqMZv043q99hZdFhGyPvQDzOY0WUmJQ7OMoGHyiRremJBzQbg8fxGyfzJ62jGoXj5r2K4UU4Vvhh9tkXtr0rnA23k99ritpVn1i42BQ+GVTPLyzha044e0fHDJwSN8jq7rJhtTcIrtmR0k1VVOgrlpsNoxKopIX+iQ2pKDu3leiEviIPMXWjHIaWiz+80pnmNtlqA= X-Forefront-PRVS: 028166BF91 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39860400002)(39410400002)(39850400002)(39400400002)(39450400003)(39840400002)(4326008)(8676002)(66066001)(86362001)(81166006)(47776003)(2906002)(3846002)(54906002)(50466002)(6116002)(33646002)(23726003)(6486002)(53936002)(42186005)(54356999)(50986999)(189998001)(4001350100001)(53416004)(2950100002)(36756003)(25786009)(76176999)(305945005)(38730400002)(7736002)(83506001)(5660300001)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:HK2PR06MB0820; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; HK2PR06MB0820; 23:3cN3GNgPkZHTQLnWsMxQDHIVfgH8pnQpXsdvOOeB9?= =?us-ascii?Q?zD1gqmnEtj+ZeR7gdMYRbS7F6Yy7MTIQDLPXNdYtaj5hYVHk+bDXbWpdFKkJ?= =?us-ascii?Q?L8rT2yzySC5Q0+psOpNHvid5v4RzKow+yDqgpcakAzK7cLZLS0w02bJyS6OH?= =?us-ascii?Q?cE1evqrQF254ClpGHWe6BuRRDJ7wnSCG1cNwT9YATcyb3u064RzboID4i45N?= =?us-ascii?Q?OV8pWizg0/EvdfA5Jfquy0xfmndQYYUJGu40krZlLevavif1M7haehikRPF+?= =?us-ascii?Q?Kd1WBbim1pZvsEAKWjT5yss3tDHlq5+GTluJx9pnnW3oQnv6CcQwwQa+j40H?= =?us-ascii?Q?SLbyAh7oVqBeM4owJSskTFBerSKLaCA66HbSNgmNeaqGNYNLZkLAO1WeN3nr?= =?us-ascii?Q?FyHUbvrW5DasrbLPyqwwbmsjhheQTC8ofOvL12qFPdvWebaoecg3V9acHm0+?= =?us-ascii?Q?PZbdufI5WzjndSt5hiUAcYisYQTYaPjUbTxXf4CZ6S00rqUT9OKcBUXVeI4+?= =?us-ascii?Q?+Xk6XRl9l2Bk5GD/aKEMfYMwcfo4a4rC5Q8ktGeMYLbKzffz41wJHkzZ61Jy?= =?us-ascii?Q?VXGb2pzFO48jcTGwhDuSO0ObofLADndqPsNw6HKBFiC2NAu3EJ0ClxRaoAIU?= =?us-ascii?Q?dmAR1/Cr75WH08RXoKLCU8ViwzQqh4hbfA4fGUVxgzy2eIIRBorNzKl61UII?= =?us-ascii?Q?7cZn/foROlRN3kwAo0XMBe80wWw9elJDW/frK/TdJkeWTv1auSxBoZcZx/qH?= =?us-ascii?Q?mGwt/7XgA/lkU3HbVhCm2i+lJgh6it/mJ1fIh8a9u1igeVSce/FG7TEqcllp?= =?us-ascii?Q?UNLJtanyfOZJdd0Xhq8jBkCu3J9xqcPdDe7srnuxPuseisYRULmUHeJr6+p5?= =?us-ascii?Q?nJCu8/riQs1DNYsJnqb4vDLeyaoUG8EAKud/MSDq0jLEPMt94zNswTW8zaUt?= =?us-ascii?Q?l0E8gjTUdBUyqoMDuQsvc3R3f4HSdyWxSBQ2H9YlGquDA/EGKMKWHQfKaFyA?= =?us-ascii?Q?0JCp6mtUBE+BJQsAm7WsVI8dHrZ53EhCS4iQ/0QzvSn4rffpqBmV+5yScOfC?= =?us-ascii?Q?nkbha0=3D?= X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0820; 6:gZRoaWD1PdcILbOFTlAukuehlXZ/s741T/5n3gtgAVSty0b5DL4vKfKK1Nxi3OjYMm12Qwzs6qlopKycEEmQxiZf7KC4xvaB+yjwNSHn6i4EC4XoyPN8hsq9125EYgHDG1AOF8ZMXioZvJKCgkdAmC5FTNFq8G+bCWYZAJ4rj5hyZMp+jsR21NGsJzLNY6ZRYf3rrN9Uv0OmPM8veTZBS/fxJi+SQ8V+QIiYHMiJHcNHIl6nTOylvqQRi+uVxtawGFuIS0idgmSyJo8DrcgZdWgQwYrTNlamJEUUQyvthDrCZRg19x5nM7DgiEpHJX0JvRi1a/iGgYGEGY+HPuO9pNMhs0ulNOq8Mwov2IEIFyz6d+8HRD873s9SIllWiuSloYhzoER5rimm3zBbF2EiTDrf6UmPnint7FR/h4Htcb8tRbc5dvjFc64EYpQ7WhR7hf0+zud65rPXQ3W7pxlLQCunfJ3p5NvYIRP3KFh6nhI=; 5:GVQRhB6eYJwKxTJ9OziMzftWA55VoZvZ6rn8aYkPkwnyaq96CmP3KIxor7J3m2MzqVlZHfKJNSZdSukxC4m+GhakklT9rYOTtZzs7fxXEJzbr/yDTb12pACr+1CZ1lIGx+C3iPLifB6UwKG+UON7AQ==; 24:wzQT9Bder8E1qSsvfhFnekDk5ZnThS2ITYDQt3si1KTl4ilZClKuwpzBX+Rh3Eq+3hjwZJMEFq27zgkhb92eSSD+O4J/ZUmbwx57mFm7GGw= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; HK2PR06MB0820; 7:gN2y0i3tFSHjlDicvoj4fv/HBdFLWR0QNgzH2Icx+hdDnHB0TmuyeT8w7kjLg+CE4D9awwvkcYHt/h0i8CuuLKYZIpjSOEegx2afhulxTyCQ3O9kUpJuDOxqa9I8Bmw4LN/38Ka99FwkMCX+i6i9ZWJQyrKW7b849MgwG92sqBnRoMWkCvvCvhg0cKWnKMF/pc0qNBEpYEDThdwx2OY4XbMQ2efzw414M40GvhUakeORVxUUBjexM92OSWh5XuVYj0BcNVLpCAqlNIHb+/+kfrU70UUa5HQFGoaXBcZzNpqM3hbeO0jZ9AXn6VfXbvvw9F7no6LZC7eWXj1Tvo5/ng==; 20:rmospdVgznb3/FXKiQ1pwaF8ISyVEMc6T+iDR7QpEAkMqC7y8nbGnyxektLaI5cyDMIAa29OxItvIVw6d1GmlRptqDUOJ6KkPrt5EE/6+XAapsddxYPa38HoDoFPelbRP0B1IisfiTPWy0PkM7ork59p3B5G38PzX3JYOFc66SE= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 18 Apr 2017 02:42:54.5906 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: HK2PR06MB0820 Cc: Linux-DT <devicetree@vger.kernel.org>, Linux-ALSA <alsa-devel@alsa-project.org>, Simon <horms@verge.net.au> Subject: [alsa-devel] [PATCH v6 5/9] ASoC: soc-core: enable "dai-format" on snd_soc_of_parse_daifmt() 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 |
diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 9ee4d4a..4a20c30 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3950,11 +3950,15 @@ unsigned int snd_soc_of_parse_daifmt(struct device_node *np, prefix = ""; /* - * check "[prefix]format = xxx" + * check "dai-format = xxx" + * or "[prefix]format = xxx" * SND_SOC_DAIFMT_FORMAT_MASK area */ - snprintf(prop, sizeof(prop), "%sformat", prefix); - ret = of_property_read_string(np, prop, &str); + ret = of_property_read_string(np, "dai-format", &str); + if (ret < 0) { + snprintf(prop, sizeof(prop), "%sformat", prefix); + ret = of_property_read_string(np, prop, &str); + } if (ret == 0) { for (i = 0; i < ARRAY_SIZE(of_fmt_table); i++) { if (strcmp(str, of_fmt_table[i].name) == 0) {