From patchwork Fri May 26 01:44:19 2017 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Kuninori Morimoto X-Patchwork-Id: 9749577 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 A5E3A6032C for ; Fri, 26 May 2017 01:44:31 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 9811428307 for ; Fri, 26 May 2017 01:44:31 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 8C060283BB; Fri, 26 May 2017 01:44:31 +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 E9D3428307 for ; Fri, 26 May 2017 01:44:30 +0000 (UTC) Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S1763558AbdEZBoa (ORCPT ); Thu, 25 May 2017 21:44:30 -0400 Received: from relmlor4.renesas.com ([210.160.252.174]:57066 "EHLO relmlie3.idc.renesas.com" rhost-flags-OK-OK-OK-FAIL) by vger.kernel.org with ESMTP id S1761435AbdEZBo3 (ORCPT ); Thu, 25 May 2017 21:44:29 -0400 Received: from unknown (HELO relmlir1.idc.renesas.com) ([10.200.68.151]) by relmlie3.idc.renesas.com with ESMTP; 26 May 2017 10:44:22 +0900 Received: from relmlii2.idc.renesas.com (relmlii2.idc.renesas.com [10.200.68.66]) by relmlir1.idc.renesas.com (Postfix) with ESMTP id 3BA99536E7; Fri, 26 May 2017 10:44:22 +0900 (JST) X-IronPort-AV: E=Sophos;i="5.38,394,1491231600"; d="scan'208";a="245229500" Received: from mail-hk2apc01lp0207.outbound.protection.outlook.com (HELO APC01-HK2-obe.outbound.protection.outlook.com) ([65.55.88.207]) by relmlii2.idc.renesas.com with ESMTP/TLS/AES256-SHA256; 26 May 2017 10:44: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; bh=nWnkxfdFg5Qm1OzHfJ5BA/zp3sHPaQY32Yw/zv24ZHY=; b=hD656gZkwOtXOrzLahlKuJw1S+cEThGF0UuGrQzRwRglq+/0CB84HDwccl4yZaysfwoOIkCpnO4qiyG/iwWWUgayxvYsYedryFM3zpuqX327J0zgjVql4znFjhbI35t+lVDL5HHA2COu6PH0v4wpNHrccSu4RHHMHForRd/OOtk= 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 SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::18) with Microsoft SMTP Server (version=TLS1_2, cipher=TLS_ECDHE_RSA_WITH_AES_128_CBC_SHA256_P256) id 15.1.1124.9; Fri, 26 May 2017 01:44:19 +0000 Message-ID: <8760gos8fq.wl%kuninori.morimoto.gx@renesas.com> From: Kuninori Morimoto To: Mark Brown , Geert Uytterhoeven CC: Simon , Linux-Renesas , Linux-ALSA Subject: [PATCH] ASoC: rsnd: fixup parent_clk_name of AUDIO_CLKOUTx User-Agent: Wanderlust/2.15.9 Emacs/24.3 Mule/6.0 MIME-Version: 1.0 (generated by SEMI-EPG 1.14.7 - "Harue") Date: Fri, 26 May 2017 01:44:19 +0000 X-Originating-IP: [211.11.155.144] X-ClientProxiedBy: KAWPR01CA0080.jpnprd01.prod.outlook.com (2603:1096:402:c::16) To SG2PR0601MB1885.apcprd06.prod.outlook.com (2603:1096:3:9::18) X-MS-PublicTrafficType: Email X-MS-TrafficTypeDiagnostic: SG2PR0601MB1885: X-MS-Office365-Filtering-Correlation-Id: 6363fff8-26e5-4278-286b-08d4a3d8ba41 X-MS-Office365-Filtering-HT: Tenant X-Microsoft-Antispam: UriScan:; BCL:0; PCL:0; RULEID:(22001)(48565401081)(201703131423075)(201703031133081); SRVR:SG2PR0601MB1885; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 3:cwBBJ8ILOVba13xHhihi3ByQvlDiZlrkSuiX0WygMJDxlLDexK86Fhazylb8qH5dPdaZRBeflG2rbwOw4Ap2rH7pbChWTh29d34NxGrpQtZGftKVJnqfkm6QNKNe1ErdnDaBZXTq/ITeS4MBfYh8kFlV5j9UvOg/pia74bTP7P8O8dnrwLRWMIqoJyX7vbK0lPPyVZ3pZqbPwWrtpd1inlNszLw0w1yaf2o2xB5tHJO6QCOROmLd+Go9KVke1yPUWHyYKbkmMktDQRCsHlqDGvHsoUgzCxZLHOzfhTSOnKpTDR5+GuMzXSV5aQkEBxeYirce+kag8MAQ6IIjEDMGCuyWnHTAsqJLQXm9wjiKB8U=; 25:E1hFwa5XxUzLlmNKHgfoZjZQbbb6DZWm2Yxgn5otWdAYgZyJ8x99CdDVIYwtQIkjdC+EoWvg3UdZc7PJbWDyHfyTm/kZTpeMGIYIXWOAgzGRqcHJ9r4plbuAxlwCpiGtv2qEAxudZreeBDL6CqtX8v6XcbSMcQ9NR01QkE/WIe6aNN8lD0LXn2cdmImjCt3Hekueod3Dh5oqolyVrDe6pd1z6VhXpQdp2wEhxMsAghTId8xrF880UuxllV3+vN2QVBe6UL5GEKqn0tkuFLE8XQC0hImrvhs1f7dAN462oVP+3TNJO+OMcQI7ImgoM5jsPxJyIwNi3ODhtp0sUrJm+driAZdD++t/XDTAxETUcYjd0Blx5kNzlpBfNoGcg9FryzFYcjSLFqcx38RtEg07CUM6gcfQgkmsrXx+uSSo70o5E3i3Cetb5G2qrf08WHDhgs30RKgtuJbck1mxhM1InJdaqDauEcBvFKL8nYGss8c= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 31:+GIU4yUMSr54XjpyZf+FtROL9ptGJGwndH0i9Dr9HYPkurAIKT061tgq4WX2IhLHCaBcy5dnKvnduEDrV/ToQvPi3eW8JNBx5M74k3GvLhWx1M3n/FMOBMboNTvTIjBfrmXQ6VjEN+EANn5v8K3dFCZJEIv64AMfpVZyJ/8mU3pZ56F88+dWQ8+ncjQHHRbE99fI7z5ZOOkHO4C/5CTXQEk3fdhjlqy6q/nxRyv09/XOobXqIpWriQvc2UNub8aJ1nynrmYVbNiNJswq6jk/MQ==; 20:DrQwxNxQC0MZv3Gz6SIURmI/I2mTpdXh5hUgUSE6Rv95U+DtT8ReCPDf74wW0uhRjIScGFHVHQuSnyH3jdiVt8hyiVGDkmik0X5k15/A9aeAzxwRuGk6GE10N8J0RKXGEOF+iLjKzNKWvlkr0Fk5JwlH6BmM9OmrcuIUOj0D8FhgzOFalMeYJ7TNEa6MemGYZH/tz9zbpZNuMYidGVHlWhUVL7ddfxLvM6rz3PIxmcxz33I/m/yFOYD3EL3rAFmgr0pFQUeNiHMXec026gcjdV4bMmwdtbAYp4T/H/RaBGtQbjjOEoJXlhYvufrSN50/nUMIVh8S3CbCEiPvE9qG/3S8/QUqY4ghg4NWCiwjyCxMtkjH2fMNYaUrfvWvWS6vbhi77KB9InQyXHG4UWxLblWqs6O7Rwg+mZ3ysgAGClv+CIuP+rhSYVlqmpIB7V6uiz5hkN3/7IpGFdKSP2WzKj3YzY7KL2ahaWHMWKZRPq/asJtRJZ3AsCqnhJd131fs X-Microsoft-Antispam-PRVS: X-Exchange-Antispam-Report-Test: UriScan:; X-Exchange-Antispam-Report-CFA-Test: BCL:0; PCL:0; RULEID:(6040450)(601004)(2401047)(8121501046)(5005006)(3002001)(93006095)(93001095)(10201501046)(6055026)(6041248)(20161123558100)(20161123560025)(201703131423075)(201702281528075)(201703061421075)(201703061406153)(20161123555025)(20161123564025)(20161123562025)(6072148); SRVR:SG2PR0601MB1885; BCL:0; PCL:0; RULEID:; SRVR:SG2PR0601MB1885; X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 4:0DBqQ0O6Lh5ETKKsfIKYXPclkX88jh53DGWp2ViB/JBKnVXHSl9M1Ecg8HHmD5oZIGcW+PC1IcEE5pLxDaYpd+WeLlf9Dkv3wM1vrW+w388J/akzMNGfobmpiFgAyXNOTV+dx6PdJoMHVVc0L2WojHDtYcnsevhtc4BcweXqOratxcuh27h1mcPjjXC9be9qjA0BD9MDS1EZiUSEfpbiogMpAf323CA3sJQdCXIUSdqsy6BlW6QHJj3wg7eojzNPqsNdbcxBxaGFphZrrQP4LYxIGllu1TE0vv47Gv52Tv/sQgN4ljSiPplng0fuh5F02wfEFXVVfVIiPlSm14IuYceuH6X2jW5FUjL3gy+eGlc9iNKyHJlrWhKicJuHbdidhl/xY8oSNqoJ8PBcEXiICy/KhF5oOzz5qmTDxXNGrLhsnRCCkIaN8S24VDN7eN+mh6zdAWyVr93yofr9Dsf5MV2R+D3FTs4amJ79tLIDEXU3yjo+rQ7u9xSFrskIRSSYhNISX2zt+RBgeee4Gsgft+heP2v482DzXpZPLHuOuHsVys6ILEsxdtpm3vVpk8kuu/xs7LXJ3m531gi+eQyDicZKBJv6HoOpQ5Tx9HqZy7pt6QnF+DUQVZIigKYaZS+SPksCg0R48h7KHWMU/My/mEaoX5Z/EYb2CsXhebWD3S9v2/1Z6x9uoo3MPZGDpgJ7e42LGyOWIn/bzgrnCpA5x2YFqb7WqIlKilvgQi/gQQaY7orLK+Iv1LBo9Y+rJd4byLFRESDZDV5UNU4+ffXQ0n4vk+CO/wdUqBdaPtsWQXMKa9pWdLqTV5O4XABYF7SM X-Forefront-PRVS: 031996B7EF X-Forefront-Antispam-Report: SFV:NSPM; SFS:(10019020)(4630300001)(6009001)(39410400002)(39840400002)(39450400003)(39850400002)(39400400002)(39860400002)(23726003)(7736002)(305945005)(83506001)(50986999)(86362001)(4001350100001)(46406003)(5660300001)(3846002)(189998001)(81166006)(8676002)(53416004)(53936002)(25786009)(54356999)(47776003)(36756003)(2906002)(50466002)(42186005)(33646002)(4326008)(38730400002)(6486002)(66066001)(478600001)(16060500001); DIR:OUT; SFP:1102; SCL:1; SRVR:SG2PR0601MB1885; H:morimoto-PC.renesas.com; FPR:; SPF:None; MLV:sfv; LANG:en; X-Microsoft-Exchange-Diagnostics: =?us-ascii?Q?1; SG2PR0601MB1885; 23:Yg7YeDLqRKrIbomxFg4fl1PMvCYa6q58fsxh2z0?= =?us-ascii?Q?qGL8Hb1OGY3liZkFRvFGgUxJVg8G7+rogvpvZx9BVISXXwiRxFg72T/ntBQj?= =?us-ascii?Q?SgkXWIBkrA7aAHW6/O5UnnP1+Lm4oO//o8jV4hPjQ2r8k4CmigzdtnyUHV8V?= =?us-ascii?Q?TYxe8QnSOZOMyGWabUiEJhwjpglGQxiZUaAdtIuY9aUqAJA40tzBPWY6vuzA?= =?us-ascii?Q?LJg82hsVpq14iI7/ZqXDNx3MhLhfoMX0u/9RtmPdSuT4PoJ2z6PCC1thWuA2?= =?us-ascii?Q?Pc+PTxiG1n4ORhmrvuaKrB3vgnjNvDvO8cRJ3PofIWFnGRQp8cB4p1cxS28B?= =?us-ascii?Q?9IBv4zB8Y//0yAYryqXdy+BjvL92m+NC4v3zIZzcD9w71NFNQB+1HShzvf+9?= =?us-ascii?Q?/LRtqYZAWnaBaWTKQ5amZhKgXrwAJZREneyyl310LJV9RXXOFynwQqNKZKeU?= =?us-ascii?Q?Rb0sINpjzpUd7hvk8dy/B8fEs67ipCk6EzflwtSmyL+5gaROja2walJ4CIQC?= =?us-ascii?Q?eG2AdAQIctxC2P+8k/KhwaO2YRE24LQRYl2hqgiNEGpCCobZxNDxTZYlN7vi?= =?us-ascii?Q?fIHJl8KW0iPr+BMWQVqkPsOHdj36lfrJx6APiPvMvDCZVweSM2luzhs+Ui0V?= =?us-ascii?Q?pDHVTqryEGpb6G1DbZNRJiClZODf3rm4iefjSL8KehBZzdi3cuIBSDdrj5lm?= =?us-ascii?Q?bccwcJ7AQVHRTayorq54rNeysvp5A+dNkHfEOKXnZ1He797yW6gvB3HqDNaX?= =?us-ascii?Q?0nRfKYDlyonrE5nKp/JDoH6mISfvEvATy1imXZDn3YxW+RWXb1ZePB5W7kfC?= =?us-ascii?Q?qXjMqsAo4FqApqqsc80t0UTHy9s6rYWvGqz1/HBQ2WA2dTyqbs0bEV42jk0R?= =?us-ascii?Q?gyEOm7u/ZN5s5Art7LWWxlm2ofLH5Y/7wpYTENdr8L2PMTaLjBB6+wlxVRd6?= =?us-ascii?Q?2Hx/ZwAPU5lwQGLS3fHQeOFGo9QSuX7bEfw+pTCG7Yx9ZLI/XYi1LnMlZnMD?= =?us-ascii?Q?2my8=3D?= X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 6:/fS30Bd9ep4pGE54+KgaCfJleWSXj++6Ml8AjJ93jpMt75syBX8amxgx1Xi/WkCSq1bDvWRfhWUIBNgLsfawFenjZOsgP5+GMRs2CJeFjhMJCIYX3zJ71AwmXkY51PNDoWKLJPyxHOBnUz7JC98vGKFcT6YVSa27Qxg8c14yUQx8uDMbheEBxoEpQybQ0s++CdfTtniKxEUaKZc+dnCp5LutJMLiQntAb3+V+rhkutdg5usbHz3pTtGYSdPOsfjipuZxtizunvbgvcGYHZZH/BdYkX2jHE1YddhgUDZ0ohInNqN4DORnbMavRacg+6rS34WSzpLyRVju18OUsq51X++8gbNRoP+1XTrhmRdTxqXMwulne/SBXeiRNgFMHoPBZgZF3sohFqghIP2XwVBmQcomID1kzhIlbyWIkCe+t/k1jDYB7Jg5DcZ0VIReXIV8JpmmI6b5QuNiaFEiKxxnWzOwJpqqcn8njXJTwd4u2ocFPoOX+VOL0nCrBjIhxK5jwtBx/Qa3Hh/SuBS/ELci5iHJUY7ytD6oQctWZbaqSWU=; 5:GecrJEa+bIYZVpESrRVnJNKIj5UCx/dk19oJO/LVDJRFDs9uccfHkIPfasszrbe+N+ANGUf8Xvcw5C4Msv1pc5cZp6H8tH8gXqpHFAiasfjrnsE/97HACfEXBhZiPL3qjxu4l5G48u6bdhouyT3mng==; 24:ao+7YGQnkcaCPqC2uik/VqdIvrS+VDixEA77cBFN8MFatH7DRHNQWLlUlcjhwQB1Gvy1smPKlgbBAdfgXoAg/CjIA+cci7S6w1Y3x9u7gaM= SpamDiagnosticOutput: 1:99 SpamDiagnosticMetadata: NSPM X-Microsoft-Exchange-Diagnostics: 1; SG2PR0601MB1885; 7:411pmRYAWpjml9TzSSyL3NVOhHt/4J68ScFBP4pxjyAjGDzuvQeipOzMoTZ0g2d7mpg/v530O7GYvUi13z2RO2gQNfW9j4hgZwY9ZKR2OPt1gUwVl1W4saFJW6Ycj4nX0Y+wNS3NcMdnygxlhJSPdMy2HyJKrfy35XUGpKazZyJQVSJhnr4uxydu3V0bWLqbHwSyLCMFbP7GnFGVB6mOFERV9S8Sc3gdZbhe3J7XnRuZk2ujfajJeKlqnU0uh0Z4aecmylMjfmV5FtZvEwnRYd7X9xfhaYZ0yEF8LqOlDjdjLa3qKkeWgKC6DQZC/v38x4uMYMOwTzIH6jxMlJs4IA==; 20:4a+2T9E54btldRPuwOfohvEzFCdPiKTwifxPc+lO/WAEk4NCRjOJ/NJi6ZKltQlsysR2XVHJ+mLapnTmixgp8+MoHGfXj0VPFjW2AIK5mOSIfxU3vyVUx40gCRIE7i2OCmrZiD7uijlkjQL/AxWgbxcS3oHRH++ZAhQ2ZYi2jf0= X-OriginatorOrg: renesas.com X-MS-Exchange-CrossTenant-OriginalArrivalTime: 26 May 2017 01:44:19.0020 (UTC) X-MS-Exchange-CrossTenant-FromEntityHeader: Hosted X-MS-Exchange-Transport-CrossTenantHeadersStamped: SG2PR0601MB1885 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 commit 25165f79adc7 ("ASoC: rsnd: enable clock-frequency for both 44.1kHz/48kHz") supported both 44.1kHz/48kHz for AUDIO_CLKOUTx, but it didn't care its parent clock name. This patch fixes it. Signed-off-by: Kuninori Morimoto --- sound/soc/sh/rcar/adg.c | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/sound/soc/sh/rcar/adg.c b/sound/soc/sh/rcar/adg.c index 36bece8..4a72fd7 100644 --- a/sound/soc/sh/rcar/adg.c +++ b/sound/soc/sh/rcar/adg.c @@ -510,7 +510,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbga = rbgx; adg->rbga_rate_for_441khz = rate / div; ckr |= brg_table[i] << 20; - if (req_441kHz_rate) + if (req_441kHz_rate && + !(adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } } @@ -525,7 +526,8 @@ static void rsnd_adg_get_clkout(struct rsnd_priv *priv, rbgb = rbgx; adg->rbgb_rate_for_48khz = rate / div; ckr |= brg_table[i] << 16; - if (req_48kHz_rate) + if (req_48kHz_rate && + (adg_mode_flags(adg) & AUDIO_OUT_48)) parent_clk_name = __clk_get_name(clk); } }