From patchwork Tue Apr 19 14:19:03 2016 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Adam Thomson X-Patchwork-Id: 8880561 Return-Path: X-Original-To: patchwork-alsa-devel@patchwork.kernel.org Delivered-To: patchwork-parsemail@patchwork1.web.kernel.org Received: from mail.kernel.org (mail.kernel.org [198.145.29.136]) by patchwork1.web.kernel.org (Postfix) with ESMTP id EC70A9F36E for ; Tue, 19 Apr 2016 14:19:57 +0000 (UTC) Received: from mail.kernel.org (localhost [127.0.0.1]) by mail.kernel.org (Postfix) with ESMTP id 2C044202D1 for ; Tue, 19 Apr 2016 14:19:57 +0000 (UTC) Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) by mail.kernel.org (Postfix) with ESMTP id 18C44202A1 for ; Tue, 19 Apr 2016 14:19:55 +0000 (UTC) Received: by alsa0.perex.cz (Postfix, from userid 1000) id 664D326641A; Tue, 19 Apr 2016 16:19:53 +0200 (CEST) X-Spam-Checker-Version: SpamAssassin 3.3.1 (2010-03-16) on mail.kernel.org X-Spam-Level: X-Spam-Status: No, score=-1.9 required=5.0 tests=BAYES_00,NO_DNS_FOR_FROM, RCVD_IN_DNSWL_NONE,UNPARSEABLE_RELAY autolearn=no version=3.3.1 Received: from alsa0.perex.cz (localhost [127.0.0.1]) by alsa0.perex.cz (Postfix) with ESMTP id 8F3002655E3; Tue, 19 Apr 2016 16:19:18 +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 A6FC2266094; Tue, 19 Apr 2016 16:19:16 +0200 (CEST) Received: from mail1.bemta5.messagelabs.com (mail1.bemta5.messagelabs.com [195.245.231.153]) by alsa0.perex.cz (Postfix) with ESMTP id 7F55A2655E3 for ; Tue, 19 Apr 2016 16:19:04 +0200 (CEST) Received: from [85.158.139.35] by server-17.bemta-5.messagelabs.com id A5/2B-06723-85E36175; Tue, 19 Apr 2016 14:19:04 +0000 X-Brightmail-Tracker: H4sIAAAAAAAAA+NgFvrEIsWRWlGSWpSXmKPExsUSt3OpsW6EnVi 4wYeXzBZXLh5ispj68AmbxbcrHUwWl3fNYbPo3NXParHh+1pGBzaPDZ+b2Dx2zrrL7rFpVSeb x763y9g81m+5yuLxeZNcAFsUa2ZeUn5FAmtG/9fH7AV97BVPT65hbWBsZ+ti5OIQEljPKPFu4 0UghxPIqZA4eeIqM4jNK5Ap8enWI1YQm1PAXeLy1X+MEDVuEp0ztoDZbAIWEpNPPADrZRFQlV g4rRksLiyQIPGn5wULyAIRgS5GidWvHrODJJgFyiXOblrEBrFAUOLkzCcsEHEJiYMvXjBDLDC QOL2gESwuIWAvMf09yEEcQLa+ROOxWIiwocT3Wd9YIMLmEmfWmk9gFJyFZOgsJEMXMDKtYtQo Ti0qSy3SNTTVSyrKTM8oyU3MzNE1NDDVy00tLk5MT81JTCrWS87P3cQIDH8GINjB2LDd8xCjJ AeTkigvj7VYuBBfUn5KZUZicUZ8UWlOavEhRhkODiUJ3ks2QDnBotT01Iq0zBxgJMKkJTh4lE R4pW2B0rzFBYm5xZnpEKlTjLocC37cXsskxJKXn5cqJc4rAVIkAFKUUZoHNwKWFC4xykoJ8zI CHSXEU5BalJtZgir/ilGcg1FJmFceZApPZl4J3KZXQEcwAR3Bf1cU5IiSRISUVANjd2eH5NU5 /I1nL0s5L2vdq3jqnpdwy5Q5eT+YGmYdDGZsTXxxpbyLk/+42QnxlwblX9qcTh78FKD3sLu7Y O+8043q3ppRzV9XFtw51xhtJds+LZKVKaY1sfcdP/sjn+oIx/CM13Ot1E5y986d/tW/yOg0o9 uKi08PT825eTJ+///Dqi0FmcFKLMUZiYZazEXFiQBtjdY5BQMAAA== X-Env-Sender: Adam.Thomson.Opensource@diasemi.com X-Msg-Ref: server-6.tower-179.messagelabs.com!1461075543!31009159!1 X-Originating-IP: [94.185.165.51] X-StarScan-Received: X-StarScan-Version: 8.28; banners=-,-,- X-VirusChecked: Checked Received: (qmail 17907 invoked from network); 19 Apr 2016 14:19:04 -0000 Received: from mailrelay2.diasemi.com (HELO sw-ex-cashub01.diasemi.com) (94.185.165.51) by server-6.tower-179.messagelabs.com with AES128-SHA encrypted SMTP; 19 Apr 2016 14:19:04 -0000 Received: from swsrvapps-01.diasemi.com (10.20.28.141) by SW-EX-CASHUB01.diasemi.com (10.20.16.140) with Microsoft SMTP Server id 14.3.248.2; Tue, 19 Apr 2016 15:19:03 +0100 Received: by swsrvapps-01.diasemi.com (Postfix, from userid 22379) id 93BB43FAB0; Tue, 19 Apr 2016 15:19:03 +0100 (BST) Message-ID: <2f0a44c076880b6e39aa8440f9a021f9627f34a3.1461071847.git.Adam.Thomson.Opensource@diasemi.com> In-Reply-To: References: From: Adam Thomson Date: Tue, 19 Apr 2016 15:19:03 +0100 To: Mark Brown , Liam Girdwood , Jaroslav Kysela , Takashi Iwai MIME-Version: 1.0 X-KSE-AttachmentFiltering-Interceptor-Info: protection disabled X-KSE-ServerInfo: sw-ex-cashub01.diasemi.com, 9 X-KSE-Antivirus-Interceptor-Info: scan successful X-KSE-Antivirus-Info: Clean, bases: 19/04/2016 09:51:00 Cc: alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Support Opensource Subject: [alsa-devel] [PATCH 2/2] ASoC: da7219: Disallow unsupported 32KHz clock setting in set_dai_sysclk() 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 The PLL function was updated to disallow 32KHz in commit 501f72e9c520 ("ASoC: da7219: Remove support for 32KHz PLL mode"), but set_dai_sysclk() was missed and still permits it. This patch resolves that discrepancy. Signed-off-by: Adam Thomson --- sound/soc/codecs/da7219.c | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sound/soc/codecs/da7219.c b/sound/soc/codecs/da7219.c index 3b1d65b..caea2ee 100644 --- a/sound/soc/codecs/da7219.c +++ b/sound/soc/codecs/da7219.c @@ -1025,7 +1025,7 @@ static int da7219_set_dai_sysclk(struct snd_soc_dai *codec_dai, if ((da7219->clk_src == clk_id) && (da7219->mclk_rate == freq)) return 0; - if (((freq < 2000000) && (freq != 32768)) || (freq > 54000000)) { + if ((freq < 2000000) || (freq > 54000000)) { dev_err(codec_dai->dev, "Unsupported MCLK value %d\n", freq); return -EINVAL;