From patchwork Thu May 25 01:51:31 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9747485 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 5A54E60224 for ; Thu, 25 May 2017 01:51:40 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 45BC926E54 for ; Thu, 25 May 2017 01:51:40 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 3AA6227480; Thu, 25 May 2017 01:51:40 +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 5D89326E54 for ; Thu, 25 May 2017 01:51:39 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1753687AbdEYBvi (ORCPT ); Wed, 24 May 2017 21:51:38 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:61280 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1753536AbdEYBvh (ORCPT ); Wed, 24 May 2017 21:51:37 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 25 May 2017 10:51:35 +0900 Received: from relmlii1.idc.renesas.com (relmlii1.idc.renesas.com [10.200.68.65]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 38E5A7036F; Thu, 25 May 2017 10:51:35 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.38,389,1491231600"; d="scan'208";a="244145142" Received: from mail-sg2apc01lp0243.outbound.protection.outlook.com (HELO APC01-SG2-obe.outbound.protection.outlook.com) ([65.55.88.243]) by relmlii1.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 25 May 2017 10:51:34 +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=CdlIb6FJMNkuSas7qglZ5LpmZNjpagvZPtEhzI96jco=; b=H8t/B1EIRK1+HBJW1T6cw7SdGC5o+nj3xm7pTAfYazkhtsyicFQ15mQ3c2bdtNU5KCV+zQNgrqFRX8sUAycLq3fAOltM0pyV2b8fJ8GKVWZ1kiFlPloEuLdSM8SWHhiZo2dMvMqxuumYjnSHVvbNYnxX5ROevfcXUbkxUqDsu2w= 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 PS1PR0601MB1881.apcprd06.prod.outlook.com (2603:1096:803:8::19) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Thu, 25 May 2017 01:51:31 +0000 Message-ID: <8737bt1zes.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto Subject: [PATCH] ASoC: simple-card-utils: remove strict limitation of bit/frame master User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 To: Mark Brown CC: Linux-ALSA , Simon , MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Thu, 25 May 2017 01:51:31 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KL1PR0201CA0020.apcprd02.prod.outlook.com (2603:1096:800::30) To PS1PR0601MB1881.apcprd06.prod.outlook.com (2603:1096:803:8::19) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: PS1PR0601MB1881: X-MS-Office365-Filtering-Correlation-Id: e89b2142-af86-446a-0730-08d4a3109193 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:PS1PR0601MB1881; X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 3:PSwWkL/PHsqbZ4a0njoyTYDehIIiMu5cnLJY5dOWdXiJF6Dh9v+E/WvK6SeVl+ezYb7aXQn66Foxk4trTl3mh6SIeTWZS2ll1n9Hd4UvGmSsVr/qqkuS2CgZ3rT8aNGFTEAMN2tL94FpaMZGuPxmpOLS8yqeTp9g+ygiVB5+rgXYe6YZx0ln+EO3ULNG/7htkUkls2oHkmo1Nw8RgZ/s1FQHC0V0Q5z9yI3qZyH625uQcOOQIqlNXcOIK8JV0gJdHNZAc3i58naiZAVF18TyOiDuluLHL83Z+BooSrGWCmxg4XydnJbuJlk00a3Rj5jQzNN6FIcim6r078Di1pyBVP0SgKbDXN1h8a3ULtwbbx8=; 25:AbZSsWUcCn49GYJ9SpKaf9w3B/pfS/3zJDaMMBoYTntGkHHndrmVeK+jOhm2FiJWR6mBwVbtxSgWu0k+DWMsRfafliuQ6mm8jwPsv5ygQCdL9brMtv0AE+v4c6DMuIskQT9eu5x4CnnMwkm6rJcq80S4Wz0Si9joceqhwTPSACKtjeMmcuEauV+f575r4Or9qWiaKqJFPn/u4UgSXo5cJHXaPJ/suXmHikCfwtN4gUUaRlQlxBF2uzjDR+nd8qFWQfi5unO0VItbIcUcot9vbPsl97yLyvFylpIBSWi5/HF6sfABC3SuTUXsUKmKRapJ/rbWTK8HuExoxk3JBsMrNLoUwDZ3/y6UxzzL5xqi4Av6nlTwo1YWoO0p48A6gb9qUNFIVkn19tvtuneYNpD1+6zxCFAv6HWtDaIePuDLKuAgXOObaHa46TwhfqGBKJfbHVuDhosMVmJ8zU1gMCuifp16/iDHXB4JGvU5M28qxSI= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 31:/sIi1CzoSVezKAfmqtTosgg0HzNBPreI88r6u+Q9HX5BuMGj/FtS8mAABQAqj1qLt4a+wkLzUjkEdKds9qOTbm7Oigv1cPOp+mTwi90/TncyHSgKzprmXKZBELB8p1OUifKA4MfAxsY/1cD1mQlk2eIhhBv3NRxB4vZrVXkLd3tUchuFnxFgdZSlUKnHvMNe138bMBxAGvMaT5apAP5mIpiF4J8f6wJqz10NBSMn390Ub78NNp3cdZCf6SxGIO1cjuaLhfL42rBVtOigHm/Ffg==; 20:/1cCDwzx09d1NsmkwC4bTOlyoQgWa4MxS5jq2xyBQZMVUMwGolFRUH/2AsZ88xbYbbwoMklB2TqsqF8mYhxK2X267oonsOF81BKOwx9Hy9tsIU/T7Yq5FIQk4rZjvwC52SqbQhR2nXzb8TAD63AOWBFma1Uv2fv/WX2cfJudmYpO/0I/3DCflW0YBCtpHtZBAX6Ng4h2pWwZMoMtIw9gCDq+G/7+S33nMF/kAZmUHrkmVY37ZDe/JUDjrxOXbt7Vttg46sKQnONLKCIB5UkBFE1PUFvUxKvjV6as3B5XOF6QYkx03fXHPeWnqtMgY0CbcWy0PLB++0jOUJmN0UPGaVQTEYKng6Ei6s03rJQaDa1z31cW8Op/8TOZV6pUKXiPSHK/asdGF/MJj9dwHdyCZ/0eqkQicakp/G6JpKOikul8mfEQ1DA0myZhBue7zxz7TCqOIpzyFYqZdAipQXAzuCqBi4SMtgXFLolFisC7wuE9gqbkP5GCQR7dH324K1Na X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(100000700054)(100105000095)(100000701054)(100105300095)(100000702054)(100105100095)(6040450)(601004)(2401047)(5005006)(8121501046)(100000703054)(100105400095)(3002001)(10201501046)(93006095)(93001095)(6055026)(6041248)(20161123564025)(20161123555025)(20161123562025)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(6072148)(100000704054)(100105200095)(100000705054)(100105500095); SRVR:PS1PR0601MB1881; BCL:0; PCL:0; RULEID:(100000800054)(100110000095)(100000801054)(100110300095)(100000802054)(100110100095)(100000803054)(100110400095)(100000804054)(100110200095)(100000805047)(100110500095); SRVR:PS1PR0601MB1881; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1881; 4:vC8yEgALK+o+fBscU+oroFbY+jYjBvUHmJpDiKdu?= =?us-ascii?Q?wueliFfH1fV2BzUzccuIkEPtEDMAgJeL/M8Hxj8A1ExDClez6AuAYb33Betm?= =?us-ascii?Q?3tF5GhLlpR1vBH5EBfIgjqSoXN9ZhJ4UymZRlpcrhPNsO4DwlBXMQZlzYSUy?= =?us-ascii?Q?IOmqC3kOVq819QUJA+X3ojNCoaPeXt7DfobdfkxvQyhxkNNauknmLbYH3cT0?= =?us-ascii?Q?DAqgfnqIsA2E267p8SGMjO6QXvaJ6jAjESHKna0wPZuDhfhsWz5SSGB2o94S?= =?us-ascii?Q?VeIZuwZo/r3x/Y9KZYZTNCCbknJHwIEO+8lMZeTJgwbRThMuxOJNjN2UB6gv?= =?us-ascii?Q?WTzUsVzw77p5INHxku8t708yAfOdbCIXSV/SBdQfnqOxFSyUQhJI7BXwYGQ9?= =?us-ascii?Q?37ybdYcXM0nLePJCj33n/5hpoBE/vG/RcJTVtX9Hz1gbA1OY8gf+qORecL7M?= =?us-ascii?Q?lgDg9S4WGsmQGHc0phBI8eWB1FNWS4BKt9mMKIxmXJA6PYk5OrDnjZhk4PSO?= =?us-ascii?Q?n7zoJfCqjOL8MnFECbXJYKrM1LPnStzAf1wh3ukc/+FwkTMzieJnypNdBOmG?= =?us-ascii?Q?HjkrnFgBauIhSECxd2bZJmlUYfj/Pv8WSRHuXwip8FkdJTgI4ymBbJekW6/f?= =?us-ascii?Q?2ED2CfwdSVLC/36AHUlBVeVxs0H8NWzV5ogXFcc4JYWPngqAbQMRHqFQk+I1?= =?us-ascii?Q?2cPruI7fjj3MPsCfZd4RFUTio6fh0HAX//LeFPC9bDeY5xbjzgbm8YFkF43e?= =?us-ascii?Q?0Eu+BElCvoecI96bPd+XTqlNx8f53CphgFKN9HBmYghwI+ZOubqb9DW4KZcK?= =?us-ascii?Q?AFGsmur0b1FPJ1Z0offpQpGjN6ONpnyEN8dLTYbmyIy550YmdKNscVcFVq7/?= =?us-ascii?Q?JSsq8e0RmRUUe8k8li0m2XsDpShGdUtafE6j1tSGhOjJ6VoKaEZLn5GzgR1B?= =?us-ascii?Q?gp0hWcZNIKCF0ywfJs1dFMakvSDJ1ax+K9bo/TNEhSodvIyAiIlMyEGZ4ZmX?= =?us-ascii?Q?8GjGg+DRsIYGSh69xROOCFkXEkzdkLRxg/OD94I6xBJpEPrh2yWU3yZ0zz2m?= =?us-ascii?Q?wvqEGB1EsBeFpuwYdcpL+XnG5XupSA6/XmJpTommpfcgOxFRKPgaFju3TfvO?= =?us-ascii?Q?lMScg+B6ctJpQwpFdsRvQpzJKE5n5/CuE1vOIoZ+pt7AAcHdNYYh7g=3D=3D?= X-Forefront-PRVS: 0318501FAE X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(979002)(6009001)(39410400002)(39400400002)(39840400002)(39450400003)(39850400002)(39860400002)(54906002)(8676002)(81166006)(6486002)(86362001)(2906002)(36756003)(46406003)(7736002)(83506001)(5660300001)(305945005)(6916009)(50466002)(478600001)(33646002)(53416004)(4001350100001)(54356999)(42186005)(50986999)(189998001)(53936002)(47776003)(25786009)(4326008)(66066001)(23726003)(6116002)(110136004)(38730400002)(3846002)(230783001)(16060500001)(969003)(989001)(999001)(1009001)(1019001); DIR:OUT; SFP:1102; SCL:1; SRVR:PS1PR0601MB1881; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:ovrnspm; PTR:InfoNoRecords; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; PS1PR0601MB1881; 23:3u4U+dkqEOUTu+vEfr7rB3OCoAS6PufFtc+4T/h?= =?us-ascii?Q?1SzN8a3dJtD0SV9w0DVade67oDsnuNVycAC3Xvi9mjf8tvb7lkvVcDD7WKJv?= =?us-ascii?Q?GrkvneRBjnoOGjr4Snd2obDncSSm/x9FbowNB/loTrx2sZ3L+o6trah6avpM?= =?us-ascii?Q?3jB/O81tyl3HEFI/GSh3swqjJ0hLvglR144+KxMwLRUwh6TlrZjwHUOZdt5K?= =?us-ascii?Q?zf/mMnnzqtyy9QVLMbFb50sfFCJDfdx1fvS/EgKn8rHQIXlDtXLU/wMkTUsT?= =?us-ascii?Q?8BbgfQuG0Nyt/dDYaPooY34nnxQWligYZgo9OjGbpgcC3lvLECHc7Zww6F0D?= =?us-ascii?Q?6Hr/5ru+mvHq5/PyLQU/Dzx2DEC4wTLpjgAkCu5dSLWLLVRzgzHRVrCvUVEi?= =?us-ascii?Q?JC4tYvRAFOStWFbEnkEfVLDI1TSIomeMs5KsAdh5goHVATeUNvMAqQVccWAu?= =?us-ascii?Q?kDVVpNj0eZ5Dre3avg15LhKXdPdBwpk+w+/YfYtB8NKH+dnEpeeuUU1fevGE?= =?us-ascii?Q?uUlCJzQdEaiwj0T5FoiMpLa22/M61guSg5MUtMXPxy+qpbz32a31oPNuZMuY?= =?us-ascii?Q?9bXp4+DhO7Z9GHUfMeMH2h7w/C8eWJ/3jJUanYg2fPrsDkON6xsxHiV5BKQ5?= =?us-ascii?Q?BVceU8gw5PNlPLp6SsSOxQeN+8APB+H6UA4+7zgp9NnooFHNoVwMaiQDYP4r?= =?us-ascii?Q?m0aLuJ1Fx4VZvViWacV+sAZ7cXQZE3kgs/ffhRriEkM+y5nju1SW8Es+kJhv?= =?us-ascii?Q?JaYZ75RKLBKklBV5PZLvpAgu1w4WF7tZPB9mAPckX9kGiZ47K6bFoA+d1nhO?= =?us-ascii?Q?XUsNdoiXS8RDJSmkWvWOPN7qUHxsms/mmr7uGvPvOmZKmhybHGrJwYmFmJLy?= =?us-ascii?Q?IqDnT1rpGmtxuJMjcrc7tY9/k+B3xE0U4A5Amv4YaVM4WOMzw0F7OXwYRde3?= =?us-ascii?Q?w+dB7gWgfm/SAvPn73m/WdYe2M+jz/3OP8Du6hjo9gfkkAkxn+PyfDHM9LyN?= =?us-ascii?Q?sySQ0xpF0fOioMaqmJsz4bo8KIaya5xixpRszg1wjR81EZKs1i2294QmwIFN?= =?us-ascii?Q?t6qYKjDOdtQTQWJpv9enlfs+UjUD1NlKmoASLyPXcYGbn9na2CfcKHWJH26y?= =?us-ascii?Q?agH/qAnUtv56kl9F7clnYMLisrbqdLHxoIseeVMILZha8MwPTX4bmNSEb13I?= =?us-ascii?Q?j8bdQ3Hihkq7vZxs=3D?= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 6:dBce5D90FKwqLYFuXqSdLFn7h4VehsEq4V4Qs5DUh8X6G9vuZBNU96N/KqquaAJi1qbIHzcogzVyyXCbttVQfxvYhrJMJ6gGAsXoJ+Z43iD0WXF6h6lzioHxkqatKjEkyvuY8fmtZZg3Cww+kD5HB1gRN5rZyu1G6SmakQ1rfqyYPplnRguJMLoqx+yoILzATEfusJh/AGQ3KWjVeKqllYsvV+4qkTsfsBUM22+Jz0OwfkXBMyl+IMT4QI3ttcHnphhkonURp1H59oBzuXh1L9jyeEAzZfh4v+pcJi0Ykb8drmGM0CdUbskaAWyiY0okTAQduybCD2aKh878svQqEowtp7vlj1Bp7vcRzqypsjgRaVMIG1kJBZHj4eV7WqK7quEwvoA2BwyNaISAxZdtFy+2B05kspD1RAWrgdyXUIJjvEQRSyhdKQWjdcJjpHl7013VMD7j2O6fjTthQFeDTUKl8oFH4X23Gatzxv3IWarfbb1lZ/ZNkXKNs9R5JhLSauvhus/DoTXfJa2W+4zLFhDL+5/NLiIEuRn4V7yhj5Q= X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 5:MbeNRedlYEELwsIKMPHaOCgNYaKI5g0YqlHn15FA62bfQPe6yGWffkb+d4sSJ7THRoCXDZDZ/Hh/QOhgVmss4AyUMggMR6G928N4LCF71HaUD5OmgjLyCxEdQJZKlbZG8256FKZsBxB7aadBGVrVS2P0cNhe/mfY5f6JuK9HpD+2EspZXiv0JHBfxfuhgNrdMrIUVoNpZVRnAt/AqFuMgEu2Glb/OY4ETTQcvHLO5UthrP34RLbgS4aHkWi+DXeQlPW7eWKZejDunxv450rNNig7ARjXD8pCWzO3Dt3QpfSn0XuKcIzGlSkkVyC/DPEJWTcmvs/8TNsEoE689bTDWgXlvlL8owrOiXv75VnKib9ghZsO6bPFMB5TGjbe87pxjUnpsHDU9NjwZ76Lh3/My3KdQGq4AuB+gAD4KtGIkcvYW9H3rVZnPLNDIUpx/sStkcNve15Ad7EuUBcL7ZuDeZjeEjuLS6jAl8vkAtonD0fZtX+Hth4LZfFryJScjgBb; 24:qRjqNiVpa1/sqvk4tEYJQ+SLxNyw+BW00+JfG7retXyH5Yt074jxbx9JjO4HErlLfMwsU3XDvwoVKZjzmkfgB6R67udNLxqPs3Dcck98CkI= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; PS1PR0601MB1881; 7:H78W5D8trfcr+fyfub5TQorI5xoKq+2lkwbNJlceNvn7UY3EV8LQwhvkSPyJMUw4ZNP1c4y1mzzyEc2v/skSLn5pUYOu3Hu4wtCE1Cib7FeUn55wKZJoZas33q9LcZT/Z5ojGh42rn4XuAy4kPWRFUAMjeiUovDhgqyf9pEawUpwFjyRPrvvl8QVtJHAbW55XdD5NRgPGj6lokjbK5hK6sLmNf+JpB519pOtQkUA64M8IhdvU43WzjjzPBJkvlsYvCwW8otYuSQwf1seW6A8AneaPJpciQgWyS0ITXjf41Hj9OH+x0wlq18p/4F0LjcjzUhFllK1VatuS1IpkzDCYA==; 20:7MWIR4ws01wgVvJ6wvlJFeFN5E3ST24ldBhC8xvfCZaGJXIv1/Hz81U4gUWFpiMaUpHdnmdDT8TQ5R7yxB39feB+UziZQHkp8ahKGuEPvOr91KgbeF9yd/wdyC5/JlrS9hVwsXH3+7U60K4ZCu0y8M9UcyfzggepsTKLLat7ayg= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 25 May 2017 01:51:31.1343 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: PS1PR0601MB1881 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 Current asoc_simple_card_parse_daifmt is keeping backward compatibility for bitmaster/framemaster which didn't use phandle. The keep compatibility, it is checking prefix length, but it is too strict. let's loosen it. Otherwise, OF-graph base sound card which doesn't have prefix can't detect daifmt. Signed-off-by: Kuninori Morimoto --- sound/soc/generic/simple-card-utils.c | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/sound/soc/generic/simple-card-utils.c b/sound/soc/generic/simple-card-utils.c index b5047e2..f5a3e32 100644 --- a/sound/soc/generic/simple-card-utils.c +++ b/sound/soc/generic/simple-card-utils.c @@ -21,14 +21,13 @@ int asoc_simple_card_parse_daifmt(struct device *dev, { struct device_node *bitclkmaster = NULL; struct device_node *framemaster = NULL; - int prefix_len = prefix ? strlen(prefix) : 0; unsigned int daifmt; daifmt = snd_soc_of_parse_daifmt(node, prefix, &bitclkmaster, &framemaster); daifmt &= ~SND_SOC_DAIFMT_MASTER_MASK; - if (prefix_len && !bitclkmaster && !framemaster) { + if (!bitclkmaster && !framemaster) { /* * No dai-link level and master setting was not found from * sound node level, revert back to legacy DT parsing and