From patchwork Thu Apr 20 01:33:24 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9689239 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 E3A956037F for ; Thu, 20 Apr 2017 01:33:49 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id D499F28387 for ; Thu, 20 Apr 2017 01:33:49 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id C8FFA28447; Thu, 20 Apr 2017 01:33:49 +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 EF7CB28387 for ; Thu, 20 Apr 2017 01:33:48 +0000 (UTC) Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 225E0266F1E; Thu, 20 Apr 2017 03:33:39 +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 91D12266F38; Thu, 20 Apr 2017 03:33:38 +0200 (CEST) Received: from relmlie4.idc.renesas.com (relmlor1.renesas.com [210.160.252.171]) by alsa0.perex.cz (Postfix) with ESMTP id 3425B266F1C for ; Thu, 20 Apr 2017 03:33:28 +0200 (CEST) Received: from unknown (HELO relmlir4.idc.renesas.com) ([10.200.68.154]) by relmlie4.idc.renesas.com with ESMTP; 20 Apr 2017 10:33:27 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir4.idc.renesas.com (Postfix) with ESMTP id AC7D75C520; Thu, 20 Apr 2017 10:33:27 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.37,222,1488812400"; d="scan'208";a="241110401" Received: from mail-hk2apc01lp0216.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.216]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 20 Apr 2017 10:33:26 +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=ZD+ctZ5PZoOdEr4CDG7p+aloPaD8eTCcpIONMYcM1A4=; b=L0uRb8BL/vfwR1RkQSHSjl7Uq0nCv37O4c5AKindpW2Lv33c7jPfyrOyZ9Z3uCevYaJxtv/4q/hFp9lfSIiCWnZb1iSVfG9XlxSCVTA/MxO/PL3xvS+XO9XfYHWexn5iR/G/qXjhD+v3+zomi37H4JTO3rqkS3B1cOSGRclKjgc= 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 SG2PR06MB0823.apcprd06.prod.outlook.com (10.162.198.149) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1034.10; Thu, 20 Apr 2017 01:33:24 +0000 Message-ID: <878tmvooif.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown , Rob Herring In-Reply-To: <87fuh3oon8.wl%kuninori.morimoto.gx@renesas.com> References: <87fuh3oon8.wl%kuninori.morimoto.gx@renesas.com> MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 20 Apr 2017 01:33:24 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: OS2PR01CA0068.jpnprd01.prod.outlook.com (10.165.51.156) To SG2PR06MB0823.apcprd06.prod.outlook.com (10.162.198.149) X-MS-Office365-Filtering-Correlation-Id: d7eb75aa-48aa-4245-ff59-08d4878d3d20 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:SG2PR06MB0823; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 3:Qc/NEmFcqMROi/Z6Ael4cPPAMCxa0gss/+fRqnU07RRnVs+nYPcIhC6hut+8Tub+A3vUn3zFDaIPGU55xlS/e4SlWRqPboA8HKdKvOcx4EpGFDfGwinLNPxZR2CXplKrIzSrJ0HK9DdrLpKU5M5IuxmxJKfWj8vhYiKxHqirQERVrOEyz76kJhJt87e0lyt+1sWfdCM0xxCx9m8T7vew7cGH1Py+hj7qbH0G7XbVXSq0h3Bk/uDjv3pse3NVs40N6EZ/yk8G4Uxxq3X7YUGawsbp995PfVgGjiPkR+6q3MoAcKtYy4I0xN0/cgigIlxkmEhqI8asdD/TUs6vJN6KyNO7QqFOa0dAwtvHgy5scKM=; 25:VjZn6burE/9K5Z4qeWms5qHp6/wqmz60+FPKzjlKhGoZgwo2kY/nRg1RvHk/f1+lRCbpCsft2C2tK8vbG41Ee63VsVPRLOlpLFvStXy7x+te2vF8urDaUlJSRk9MzWmXBXsX/yNi4jCvKogNMvZt2qSt799fQyvSy/+KART2NDOdAM342k/UC3eXHD2aHSBXbXM8KPd2rLkK5ZvVUjX0ueAG9heqKfXVApSWKfcbzwqwoUQQd3rdL6iatdstsuJKUj+ZIu/cIkA2m3EDJ4s4H9hRhfR4xGh222EeWrqc/nIU3MYJhm+XL6dDo1FQ5qfbzqkhovqeGnkPzZqvNaHgIv5nSoooNaPIcvbArg0FhimaDaa0dFFp9CVPciIEkiX6DcTNXIi+tLRfRFlHoX/v2SssLX7XITnn9iFrkU1YYFblOwZ9WA/3UfglJWulqsIgBxSroXn0T8bfCcSRckRTfQ== X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 31:PMElejQfyr9IXpUeUs1kKJgta29EQ+9XtiwXAfrEZXaVd2wLprNzp0yrSFzf6DlQGm4tDvATIFYwNgIOYCby2+JX30hsvmAWUcrGeWNeobd1IqZ4BTINFvxSN+4tZeteNqI7lw5XeqHJC4aeD0+kVHgiPnBncmNOmhAM1f9LLdXIpOhAABESCGxRUnAyYJipcI6sNOeZNRUtFv38pfol64aipGAFPbEVc6afYqEbZaOd6mJh4hUeE8zV9Q4J/KRH/b65Fr79WfHXJMK2fa8FnA==; 20:5XPIC73RKqU0H/I5cVaixAyMNCLv3oWxDJIxYxaHoXS6cSx6G7weWr55IXLHj8XN7+e7qArIDDZpPOyXUEPvb9IWMvyHY9L3CIMM43KXLk9PW6rG2Ed+rU5ulqSh9W30bo7WiScdvkVx8YlKUGdHwn4S8OZnDp8y3R4alxWEYsXD59BU5wFkEM4Nn0+1Yb/XB2LKSOp5CGsFYDFnCxAj4T3LlK//hffnOnk2hdGEkEolV04B3ce2SnOSPJeNpPDIuriv24nFbbZfk3VmhL2TvImg5+8UEpmbdYeeMVzznrL57+9AYGGE5w4n58+wxpYcGVUbc38fD+R5Wdn8vJob3hPj/Hkyw+TqUDPfcgWJ7pN98DZRoTFmvxS2LmlkBNgm2uMwqhPQiWN3U+9RuofosoBA2QCz6NWUrVM8n3G8buSjm7+cncYIba51oebJ6SVhgiPI8f0VzLNG2fD9Ucnyi/JV8bzCQyMiuMVTCz13XN4ufLUlynT4X30RADsVRcyr X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(5005006)(8121501046)(10201501046)(3002001)(93006095)(93001095)(6055026)(6041248)(20161123562025)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(20161123564025)(20161123555025)(6072148); SRVR:SG2PR06MB0823; BCL:0; PCL:0; RULEID:; SRVR:SG2PR06MB0823; X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 4:8KWpMKgyrvV94PO7LWsKKOCRZq0D0q8zDeggvCl/EHv/F4blD9Syff8cFQwTVv0zasfhCCPB0eQHhCzGghhDe7yfE7xGnjI4LdJCC0t0z3fpSuhs2PWP+15N9CSeSyUpQSzQhilpRmFHazMnjT0rhSf4H3ji0M/9+msfpnvJAx2+hkYCF6RolvRY9nniJvtOZimT4xHPd5fkXyR419M7odbwfBZA8cUmzqRhnjXzVeA2vMyfICEExOy4yXD59UVqjMXV9z0Mxx7CC3kmJjm2UQR6tq9tse5flcp+2p+GTK8AgBJJlXABXextZCmM9RR6TGyPbKx7Pv8nTUIbGzU1C53Nuo6bIGCMN7mBRDEq6IFxeTxeouYKHhgURsV1lhBwgpwzu96DiskyEU68MHKktPQM7lqJDzy49rFTa/IvmZsnl/F8Hjxj1g1mKAozhAItUw7EXu7i9pSPCzXSr0Rtb/LlAGVxsewVBkSD9/Vfh9Bdyp8L19cpd8rRQaIVGXFKhsCAWnrJnpFLx0DV2L9dNz84Fy1fgUEec6ay3H4hBEG8ZTR3H4Bo+YvCX9EOIfVLpZfC/YRf77iJzssJoKFcHboWdHwCnsS3PegUvjlHUcIxt+urZfcAk77DUqH9B+U1enVc99/XVVqfZD2KuniCT3Uj3hxQnVuucD93u/EHAmJquctpFG2E4/mmaTcoK7NKLEyuYvpY8hXwZkgMAA1vlCnP6WmxPVJ2nArfFZwBLWs= X-Forefront-PRVS: 02830F0362 X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39410400002)(39840400002)(39400400002)(39850400002)(39860400002)(39450400003)(47776003)(23726003)(46406003)(3846002)(6116002)(189998001)(54906002)(2950100002)(305945005)(4001350100001)(7736002)(54356999)(50466002)(66066001)(81166006)(50986999)(76176999)(38730400002)(33646002)(8676002)(36756003)(2906002)(53936002)(25786009)(53416004)(83506001)(42186005)(5660300001)(4326008)(86362001)(21314002)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR06MB0823; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR06MB0823; 23:7hu7QvTZ6kqghC8p6i9S+9T1LMKYhsK8/OarkS1ac?= =?us-ascii?Q?YciwnJQPw3qCNRqxjO0QHrqTtrfFqcAkn0wddxvSXMQF8GitJWdUYCbpxIxV?= =?us-ascii?Q?RSra0DsPN1YL8IxRJiBC52Dgfkupyl62TTAZ/JcOEhD8uKpNBe6nLOdQPtak?= =?us-ascii?Q?Omsjs84pHpGGN/6OTix8ZqUrRatvyK203OlmuXudyLxMSEGgFWMdMyPFWlfR?= =?us-ascii?Q?lD/QHksPzA+5Arz+Cu9d+lCZkORJGYyhmpEvSwxJ7kceiXLoDz9XKKVIU08f?= =?us-ascii?Q?wQRe1hCcaMg3foWOt8qIfmhHdJZqs8T04AI2yQmh7jnZ92R+bRFNHdq+Eflg?= =?us-ascii?Q?EiAaJY/OdTJf+uCFF1h69XTqHaUVHIOxsGZ2Af+9S31y1zWW8qgCcYp4RNID?= =?us-ascii?Q?aQeNs8pbTVJZKks2L35mgIaek1KeXlhqiZoGpTQQ3Kp0SeAAzwMdIr24keUC?= =?us-ascii?Q?nKtvvBdqt9E9dGixrx0x7VwTcM3eDsLwjbcfGFZLttT3nRIc6NsrByqC9C5y?= =?us-ascii?Q?/c+KLEOSZXeVdBO1v8yXIzNQY62R4AXZ8n5qTnTLiuRxWT0RJHarq6dbQOLw?= =?us-ascii?Q?vvWpWt3iurDWb2WwWMtE3OznBHd2uUwkpUwR01LQLxGOTy4QBDOM9SloVgCT?= =?us-ascii?Q?ksNT85IIPGD6v9hnqEBUJxMlsE6+00i/rm16FwI9Fw5B39bsyrrOfk+g55b3?= =?us-ascii?Q?J174rw3VUcVxlGqU6oylUo14Wf/6eqgZnJa2raxOsD45mwqf7XRq2Dl82BN+?= =?us-ascii?Q?14/R70ks/Ucy2+yR+6KrBP5R29X2XbnnJfDcaemONuY5P2YCPrF5wvF57VJu?= =?us-ascii?Q?uXWtwk2SLG/Lw6bE+kjBY7pOHSWc6MNAXrbPDfv1wg0WTAkCfdgGz9q9FXy5?= =?us-ascii?Q?lKrEdSmZc8psCSMRlZDrvBsei72o025UihkrcAMl5WS5lxd4wfGfSn8/FQG6?= =?us-ascii?Q?E7NTXsycTsuyD9dHwV8G5aBzV1srrY54aBWgPK5XbHI1AuYvJU6dKj90+QgC?= =?us-ascii?Q?JUkvyPwSv4G5fZsfBSWybm3Zv5tiC/1GZHPo15mhLoJAQi9QWhqVqJVuySF8?= =?us-ascii?Q?Nu6noA=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 6:OUxKDuk3Hi2mmGfdUVwGJruJKcXitcflqBdaNf5MmR8ooZbl9ebS3JLdWa1ZebDwf4XEY5xNwOLAywbODpK935xzy+QeQenIjrZJ/+vjGAYAYXThK/Y6VUpJC05YZlGtqW5w+YgJERDlS+nLa0nmEYBBt7EQfOfUMdr5xONTnE0yz6sPirYh4PKwAbUpWCVIBo77TTkxvvnGyAJ0odA/XOptoRFJaRADYh98fpxHI3xTgjipg0Q/djbmlMb9a0BioPN5GL3cPMiSUvMTDFpPzUm45yVX+KJugskJUK1FcdsnPFg3gQ8I93kx89U7FMEMxppHSGGOsA6x2L/jWAIiEH6ekdnBCETguAN2zYEHrmmtGDJpsdTtKHWQfNSsJJZXVSpgz2ubnDd3NrLZrGO7NNGHlruFfCx0EhnyPf/8682BLp0SnPupPiblM/WcPNLQDh/rp5AwOIPbm+wHHz79ZxT1ZXGxspBOjoOu+3WplzM=; 5:zsrFx3T6rEFEfptrIuFq93Fomy0HnO+Z3TlQgvFU8alYjTisDQRcgFPDcOu5Q17RNM5iZdhynNSXDQUJpMW40ynQyrYSnp9tf6uXVvig7ptLCnQz0u2yBUpYlv/iYHwFvIdB0Go2lpNtqa7bxHXhQA==; 24:oyaXAEZB3BtGD/wHIaQBtMkmL+Xal6NE9yggqKb0RYTkeQAcgt5XWEBWuZR67PlE2UIYMqp3yqFa08hN36ClrNwFUVMGdmvAU0byYCb532w= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR06MB0823; 7:ISQCSPtc50m60Mire6msCJxyg+Qnw5k7itiOr4qFx2TMUyrmIY0nBv588tFP9Ns45keOznJX0+Zg70TZgNFCgsgSZjhmiplAB6GpcL+n+PVqnoz/THtBqa5WQFcMFszH1VcyGnfXtyVpWHbh3V/IFdPVHiHJYoSwO1ad9XbBlkcPMChE8deMtr2M9Zcbi4OgCgGTiyZjQTMj6l47aLB8kkNL5l1YZM14SGLODdXX6tELNBCvr+Wk8x/Kb262Mu/5efNJGuq9cU2uYkXMZY33eUK9rf1ZT8pyS9aQ8zwzEHfaFjiRfyduBAH9GkWYecwbhkBMbVp1vVeDiy5xfYJecg==; 20:8fFdUcQo6pQiC/tXQLNFikPKwQq2yutYPWMPTnRlMy/DZUWiyMuS7PspgzhOcvFa5sgzjgCvNVYljegAxEp1UldxoybLz9QTOeaXdCNpHSEL0VY8vzgUkOyxaIeOjDn9PNckpTvmLH4q24bWOAb/1AcNFCaN+d0UNISfUJDFjEg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 20 Apr 2017 01:33:24.5178 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR06MB0823 Cc: Linux-DT , Linux-ALSA , Simon Subject: [alsa-devel] [PATCH v7 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" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Errors-To: alsa-devel-bounces@alsa-project.org Sender: alsa-devel-bounces@alsa-project.org X-Virus-Scanned: ClamAV using ClamSMTP From: Kuninori Morimoto Current snd_soc_of_parse_daifmt() detects [prefix]format, but "format" was unclear in some case. This patch checks "dai-format" first, and try to check "[prefix]format" if "dai-format" was not exist. Signed-off-by: Kuninori Morimoto --- v6 -> v7 - no change sound/soc/soc-core.c | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/sound/soc/soc-core.c b/sound/soc/soc-core.c index 8be2ce1..e84a820 100644 --- a/sound/soc/soc-core.c +++ b/sound/soc/soc-core.c @@ -3955,11 +3955,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) {