From patchwork Wed Jan 24 14:11:00 2018 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Code Kipper X-Patchwork-Id: 10182621 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 96B1260233 for ; Wed, 24 Jan 2018 14:11:30 +0000 (UTC) Received: from mail.wl.linuxfoundation.org (localhost [127.0.0.1]) by mail.wl.linuxfoundation.org (Postfix) with ESMTP id 8625A28896 for ; Wed, 24 Jan 2018 14:11:30 +0000 (UTC) Received: by mail.wl.linuxfoundation.org (Postfix, from userid 486) id 7AAF728898; Wed, 24 Jan 2018 14:11:30 +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=-4.2 required=2.0 tests=BAYES_00, DKIM_ADSP_CUSTOM_MED, DKIM_SIGNED, DKIM_VALID, FREEMAIL_FROM, RCVD_IN_DNSWL_MED autolearn=ham version=3.3.1 Received: from bombadil.infradead.org (bombadil.infradead.org [65.50.211.133]) (using TLSv1.2 with cipher AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.wl.linuxfoundation.org (Postfix) with ESMTPS id DC54428896 for ; Wed, 24 Jan 2018 14:11:29 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20170209; h=Sender: Content-Transfer-Encoding:Content-Type:MIME-Version:Cc:List-Subscribe: List-Help:List-Post:List-Archive:List-Unsubscribe:List-Id:References: In-Reply-To:Message-Id:Date:Subject:To:From:Reply-To:Content-ID: Content-Description:Resent-Date:Resent-From:Resent-Sender:Resent-To:Resent-Cc :Resent-Message-ID:List-Owner; bh=wcZvZiZ/ejFIxfK4bkCld8g0I9TQVLF6NrWMGi9IzbM=; b=rqCkl7nAeB1hL6YIhIHkEDsTpf xAmDxv48oSh2LUoYASnNA5flsF5MOKNkotuXdSkSFEbBKlDnOkgyU8kCsGZ+vYRI1tkzpvkt9PszT vPNvZB/YuTOZWLqWVr37C4IG9Kc0yC9OLeZG9oGxm7RHZLxjUd3idv9YAuBYBDuaY79VnnL+j1O6k WBGZixo+3Z+xa8BmhNelIqNiaWWBYs3HsRpIILQDc5sX09jtqT8b5Q1Cc1rwX4ILBHyyX7UPxOBFR HLvFOiqp8s832Vqd1iv+PcJ0HcylUsp7SE+ntdkxPZX1q5rM7fl7PHiN6uVoTy31DsZ0bv+R+LM4D iDGvTWNw==; Received: from localhost ([127.0.0.1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.89 #1 (Red Hat Linux)) id 1eeLlu-0006OZ-Dn; Wed, 24 Jan 2018 14:11:26 +0000 Received: from mail-lf0-x243.google.com ([2a00:1450:4010:c07::243]) by bombadil.infradead.org with esmtps (Exim 4.89 #1 (Red Hat Linux)) id 1eeLln-000685-HB for linux-arm-kernel@lists.infradead.org; Wed, 24 Jan 2018 14:11:23 +0000 Received: by mail-lf0-x243.google.com with SMTP id q194so5386094lfe.13 for ; Wed, 24 Jan 2018 06:11:07 -0800 (PST) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=gmail.com; s=20161025; h=from:to:cc:subject:date:message-id:in-reply-to:references; bh=f1ceExQKWOC8n0a+sSO2Q5+NeaU83gQTST1JtBT+8+M=; b=A+2Km8JGVuXrZQNTTvQrUTjkVcG9cT2BkW00d7v0vH521wThRppKxaMLBU94M0gfsU gV0t8hqh2sQoOgCulPgkSkrny6G55Hmc0rdSCHIOnOUEeNI89/7RO2TMlQuiGXh1C/3E Bprq0Ro3gb9i0uE/u9eJoompkYPK9RLjXWUVXpEMmuOH6r3oq6YyXSHMvcttla3hS8Xu n7ThkyWKD6424ZT56BzeK44ah9ooUTGYPxy2bIaKKQi/VcG3wR59VFzJ1Y9WsVL45fqQ B6MNYPC+V5cG9PxcoBvNnJhKKc+/CffqtbE0qBuuZ71puOLSg6//BBdf3oMU7fG45K5g 7G6w== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20161025; h=x-gm-message-state:from:to:cc:subject:date:message-id:in-reply-to :references; bh=f1ceExQKWOC8n0a+sSO2Q5+NeaU83gQTST1JtBT+8+M=; b=G/sMBF86MTWAziGfRd/qLTZRsy5PsIhfV3i61+oYpzHXxa7DhHJ7TF3Pi1ngYgJ+4k DlC0AxIbQTz4AopYlqc9CKvk99H+Y2e2/1mzAKA4luXTzFckklIyrNEPubgcyBG10fET rTVVhb7rjYM6OOVI5aeT/x7WJ5OZyUKt/sFIxhg/+lnUMMg4Y0ACW3xpx3ldeGykwZQs qSt1VVINPedDprQDJtMeisnUKf9x4qF8qJFSNWlvR04O0LvTMNpc4I3aoCUOsvC36av2 BwUwQ3wtHZfUbORbZc5BrC6PJ+FUlhibA2qXU7S6/hE0XoLQLAOgnCoyhzVhMm/SaxzT NUEA== X-Gm-Message-State: AKwxytd6vWWyu3lKJ07BmxGqYIsyntjmrffS3zZ/m7mmMoLy6GBWEz/t PAPbbzwjkrMoXEExldyh+4k= X-Google-Smtp-Source: AH8x227zt6jp5iHkaoomVR6nKBZMNWNtTFg9R1BnbAzjZKSy6qMVh/dl19DCCMTHIy/w64dQpbcN1Q== X-Received: by 10.46.68.133 with SMTP id b5mr3873665ljf.62.1516803065956; Wed, 24 Jan 2018 06:11:05 -0800 (PST) Received: from localhost.localdomain (c80-217-9-219.bredband.comhem.se. [80.217.9.219]) by smtp.gmail.com with ESMTPSA id r84sm579227lff.72.2018.01.24.06.11.04 (version=TLS1_2 cipher=ECDHE-RSA-AES128-GCM-SHA256 bits=128/128); Wed, 24 Jan 2018 06:11:05 -0800 (PST) From: codekipper@gmail.com To: maxime.ripard@free-electrons.com Subject: [PATCH 2/3] ASoC: sun4i-i2s: Do not divide clocks when slave Date: Wed, 24 Jan 2018 15:11:00 +0100 Message-Id: <20180124141101.12867-3-codekipper@gmail.com> X-Mailer: git-send-email 2.16.0 In-Reply-To: <20180124141101.12867-1-codekipper@gmail.com> References: <20180124141101.12867-1-codekipper@gmail.com> X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.21 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Cc: alsa-devel@alsa-project.org, Marcus Cooper , lgirdwood@gmail.com, linux-kernel@vger.kernel.org, be17068@iperbole.bo.it, linux-sunxi@googlegroups.com, broonie@kernel.org, linux-arm-kernel@lists.infradead.org MIME-Version: 1.0 Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+patchwork-linux-arm=patchwork.kernel.org@lists.infradead.org X-Virus-Scanned: ClamAV using ClamSMTP From: Marcus Cooper There is no need to set the clock and calculate the division of the audio pll for the bclk and sync signals when they are not required. Signed-off-by: Marcus Cooper --- sound/soc/sunxi/sun4i-i2s.c | 116 ++++++++++++++++++++++++-------------------- 1 file changed, 64 insertions(+), 52 deletions(-) diff --git a/sound/soc/sunxi/sun4i-i2s.c b/sound/soc/sunxi/sun4i-i2s.c index d7a9141514cf..626679057d0f 100644 --- a/sound/soc/sunxi/sun4i-i2s.c +++ b/sound/soc/sunxi/sun4i-i2s.c @@ -195,6 +195,8 @@ struct sun4i_i2s { const struct sun4i_i2s_quirks *variant; + bool bit_clk_master; + unsigned int tdm_slots; unsigned int slot_width; }; @@ -282,67 +284,73 @@ static int sun4i_i2s_set_clk_rate(struct snd_soc_dai *dai, int bclk_div, mclk_div; int ret; - switch (rate) { - case 176400: - case 88200: - case 44100: - case 22050: - case 11025: - clk_rate = 22579200; - break; + if (i2s->bit_clk_master) { + switch (rate) { + case 176400: + case 88200: + case 44100: + case 22050: + case 11025: + clk_rate = 22579200; + break; - case 192000: - case 128000: - case 96000: - case 64000: - case 48000: - case 32000: - case 24000: - case 16000: - case 12000: - case 8000: - clk_rate = 24576000; - break; + case 192000: + case 128000: + case 96000: + case 64000: + case 48000: + case 32000: + case 24000: + case 16000: + case 12000: + case 8000: + clk_rate = 24576000; + break; - default: - dev_err(dai->dev, "Unsupported sample rate: %u\n", rate); - return -EINVAL; - } + default: + dev_err(dai->dev, "Unsupported sample rate: %u\n", rate); + return -EINVAL; + } - ret = clk_set_rate(i2s->mod_clk, clk_rate); - if (ret) - return ret; + ret = clk_set_rate(i2s->mod_clk, clk_rate); + if (ret) { + dev_err(dai->dev, "Unable to set clock\n"); + return ret; + } - oversample_rate = i2s->mclk_freq / rate; - if (!sun4i_i2s_oversample_is_valid(oversample_rate)) { - dev_err(dai->dev, "Unsupported oversample rate: %d\n", - oversample_rate); - return -EINVAL; - } + oversample_rate = i2s->mclk_freq / rate; + if (!sun4i_i2s_oversample_is_valid(oversample_rate)) { + dev_err(dai->dev, "Unsupported oversample rate: %d\n", + oversample_rate); + return -EINVAL; + } - bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate, - word_size); - if (bclk_div < 0) { - dev_err(dai->dev, "Unsupported BCLK divider: %d\n", bclk_div); - return -EINVAL; - } + bclk_div = sun4i_i2s_get_bclk_div(i2s, oversample_rate, + word_size); + if (bclk_div < 0) { + dev_err(dai->dev, "Unsupported BCLK divider: %d\n", + bclk_div); + return -EINVAL; + } - mclk_div = sun4i_i2s_get_mclk_div(i2s, oversample_rate, - clk_rate, rate); - if (mclk_div < 0) { - dev_err(dai->dev, "Unsupported MCLK divider: %d\n", mclk_div); - return -EINVAL; - } + mclk_div = sun4i_i2s_get_mclk_div(i2s, oversample_rate, + clk_rate, rate); + if (mclk_div < 0) { + dev_err(dai->dev, "Unsupported MCLK divider: %d\n", + mclk_div); + return -EINVAL; + } - /* Adjust the clock division values if needed */ - bclk_div += i2s->variant->bclk_offset; - mclk_div += i2s->variant->mclk_offset; + /* Adjust the clock division values if needed */ + bclk_div += i2s->variant->bclk_offset; + mclk_div += i2s->variant->mclk_offset; - regmap_write(i2s->regmap, SUN4I_I2S_CLK_DIV_REG, - SUN4I_I2S_CLK_DIV_BCLK(bclk_div) | - SUN4I_I2S_CLK_DIV_MCLK(mclk_div)); + regmap_write(i2s->regmap, SUN4I_I2S_CLK_DIV_REG, + SUN4I_I2S_CLK_DIV_BCLK(bclk_div) | + SUN4I_I2S_CLK_DIV_MCLK(mclk_div)); - regmap_field_write(i2s->field_clkdiv_mclk_en, 1); + regmap_field_write(i2s->field_clkdiv_mclk_en, 1); + } /* Set sync period */ if (i2s->variant->has_fmt_set_lrck_period) @@ -501,10 +509,12 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) case SND_SOC_DAIFMT_CBS_CFS: /* BCLK and LRCLK master */ val = SUN4I_I2S_CTRL_MODE_MASTER; + i2s->bit_clk_master = true; break; case SND_SOC_DAIFMT_CBM_CFM: /* BCLK and LRCLK slave */ val = SUN4I_I2S_CTRL_MODE_SLAVE; + i2s->bit_clk_master = false; break; default: dev_err(dai->dev, "Unsupported slave setting: %d\n", @@ -525,10 +535,12 @@ static int sun4i_i2s_set_fmt(struct snd_soc_dai *dai, unsigned int fmt) /* BCLK and LRCLK master */ val = SUN8I_I2S_CTRL_BCLK_OUT | SUN8I_I2S_CTRL_LRCK_OUT; + i2s->bit_clk_master = true; break; case SND_SOC_DAIFMT_CBM_CFM: /* BCLK and LRCLK slave */ val = 0; + i2s->bit_clk_master = false; break; default: dev_err(dai->dev, "Unsupported slave setting: %d\n",