From patchwork Fri Dec 16 09:46:23 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 33922 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp870130wrn; Fri, 16 Dec 2022 01:51:14 -0800 (PST) X-Google-Smtp-Source: AA0mqf49Ha3XL6aivuOGYeJMHWKsIFSf4wDMWKpylvwv4TGeY2xFurHuWQ8onRorAgiduXkp1OIK X-Received: by 2002:a17:906:2288:b0:7c1:1001:600a with SMTP id p8-20020a170906228800b007c11001600amr37942303eja.77.1671184274503; Fri, 16 Dec 2022 01:51:14 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671184274; cv=none; d=google.com; s=arc-20160816; b=lzLqK2KkzoYgyCxup5BJMtuiWPB2dRxRZQMEw/NyFB7VfdXNyPrHrzylIDiINf3xIz L7lfM71h2N+tLAN0t+tdkXSi0KxY7xcwbhwQasQOb6I9QoLEv5yFMlFJyVLM3trH95SW r6WguNhlvooCEKsHwSfwlLJqXYzhe2b7SKiaxUWBcF7IYtlkwwVgeo0dzUXIVV4NjfEN XWxS8iIwn70zwGhl+MKMuNNuXrlabr5xFP8aTn2mWxsZwPm7zyevdm8td85C/7536gBX P3vrEdbjmV89VSdOO+L/RPeH/MgPKAgVluMN0TdWEkBcIc9RsxBMW5yemPe1rQ/k89xI K6Ag== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=google.com; s=arc-20160816; h=list-id:precedence:content-transfer-encoding:mime-version :references:in-reply-to:message-id:date:subject:cc:to:from :dkim-signature; bh=QjrOuOyv1lBx156ygBTuGYeWBUOwe+V7ssNzofrG5HE=; b=c5nViR/g2rKCbb5vb11IQq65PXO5GT42w/1gygo9FQGbQpxq0jhVf8/q8a/c1pHYhI Cm6VS19uqvEE4hnsrLUDg9+dxurD0uHezHzBB3P1OtDCLzIas+znztsTqwESCIV3lpQu c50z1dBivEjey4cseApjAct4qSpmweZ5j0E1sIYzrs8hfoN6MX0XvNM+Db9o4zcSHLsv pvgd/7E2VFni2GnNL/OymHDGDW8lBThmjuLvWCUtdlqk+3ybxu+vOUUVpoFTkx7fuczj qUKZ0uimTgNo6DJgnwHKRPk49tH8NZsuvTZEaQLaE5EJYMxMYwVkhfCWSPK6U3nbvveO Apcw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=OUc7HgVE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id j8-20020aa7c408000000b0045c7611d8ddsi1855996edq.179.2022.12.16.01.50.50; Fri, 16 Dec 2022 01:51:14 -0800 (PST) Received-SPF: pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) client-ip=2620:137:e000::1:20; Authentication-Results: mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=OUc7HgVE; spf=pass (google.com: domain of linux-kernel-owner@vger.kernel.org designates 2620:137:e000::1:20 as permitted sender) smtp.mailfrom=linux-kernel-owner@vger.kernel.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S230212AbiLPJqp (ORCPT + 99 others); Fri, 16 Dec 2022 04:46:45 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36852 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229583AbiLPJqm (ORCPT ); Fri, 16 Dec 2022 04:46:42 -0500 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id B895731DFB for ; Fri, 16 Dec 2022 01:46:40 -0800 (PST) Received: from localhost.localdomain (85-222-111-42.dynamic.chello.pl [85.222.111.42]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits)) (No client certificate requested) (Authenticated sender: lukma@denx.de) by phobos.denx.de (Postfix) with ESMTPSA id CAF8C85203; Fri, 16 Dec 2022 10:46:38 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671183999; bh=QjrOuOyv1lBx156ygBTuGYeWBUOwe+V7ssNzofrG5HE=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=OUc7HgVEIh0X/Hwk/JsXi+qLVmWbUWnmJ80icQijdwTHh8r0OW9IMy/hyNk/ZpCSa EDFnJ7j3Fq71IVxM3WGKQ480avojWIK4AVht0ivyw6GDWfPoyutg4jQfXTSTFnqa+m Zm8DxHOlhGm8XD6cviXYcGxRSuXwj6aztV9Ked0MG2Z221pWxE8z5AEDYO8jWK/UjL ytWLzrkJZ7gisLHwIw1+cl+FqHugjC/6gS23LjgCCsg+4bmkKVEiCtbLppr3CG4YFu rjYZS6yQ5DTpoowherl1eD7+AtT4LkhWwxaRSELeJqZdaWFrl1ZO2Wq/5wFl2r+Fpl S3oIB2fzoX9hA== From: Lukasz Majewski To: Liam Girdwood , Mark Brown , Charles Keepax Cc: Jaroslav Kysela , Takashi Iwai , Stephen Kitt , patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Lukasz Majewski Subject: [PATCH v3 2/3] ASoC: wm8940: Rewrite code to set proper clocks Date: Fri, 16 Dec 2022 10:46:23 +0100 Message-Id: <20221216094624.3849278-2-lukma@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221216094624.3849278-1-lukma@denx.de> References: <20221216094624.3849278-1-lukma@denx.de> MIME-Version: 1.0 X-Virus-Scanned: clamav-milter 0.103.6 at phobos.denx.de X-Virus-Status: Clean X-Spam-Status: No, score=-4.4 required=5.0 tests=BAYES_00,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_MED,SPF_HELO_NONE, SPF_PASS autolearn=ham autolearn_force=no version=3.4.6 X-Spam-Checker-Version: SpamAssassin 3.4.6 (2021-04-09) on lindbergh.monkeyblade.net Precedence: bulk List-ID: X-Mailing-List: linux-kernel@vger.kernel.org X-getmail-retrieved-from-mailbox: =?utf-8?q?INBOX?= X-GMAIL-THRID: =?utf-8?q?1752363722264895834?= X-GMAIL-MSGID: =?utf-8?q?1752363722264895834?= This patch enables support for internal wm8940's PLL and proper divider to set proper value for 256x fs clock. This approach is more flexible and replaces hardcoded clock values and makes the codec work with the simple-card driver. Card drivers calling set_pll() and set_clkdiv() directly are unaffected. For the reference - code in this commit is based on: 51b2bb3f2568e6d9d81a001d38b8d70c2ba4af99 ("ASoC: wm8974: configure pll and mclk divider automatically") Signed-off-by: Lukasz Majewski Acked-by: Charles Keepax --- Changes for v2: - Remove not required line add/remove - Rewrite the commit message to describe more precisely the problem Changes for v3: - Rewrite commit message with proper refernce format for patch - Add Acked-by tag --- sound/soc/codecs/wm8940.c | 101 +++++++++++++++++++++++++++++++------- 1 file changed, 82 insertions(+), 19 deletions(-) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 0b59020d747f..1b02d5e8a007 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -37,7 +37,9 @@ #include "wm8940.h" struct wm8940_priv { - unsigned int sysclk; + unsigned int mclk; + unsigned int fs; + struct regmap *regmap; }; @@ -387,17 +389,24 @@ static int wm8940_set_dai_fmt(struct snd_soc_dai *codec_dai, return 0; } +static int wm8940_update_clocks(struct snd_soc_dai *dai); static int wm8940_i2s_hw_params(struct snd_pcm_substream *substream, struct snd_pcm_hw_params *params, struct snd_soc_dai *dai) { struct snd_soc_component *component = dai->component; + struct wm8940_priv *priv = snd_soc_component_get_drvdata(component); u16 iface = snd_soc_component_read(component, WM8940_IFACE) & 0xFD9F; u16 addcntrl = snd_soc_component_read(component, WM8940_ADDCNTRL) & 0xFFF1; u16 companding = snd_soc_component_read(component, WM8940_COMPANDINGCTL) & 0xFFDF; int ret; + priv->fs = params_rate(params); + ret = wm8940_update_clocks(dai); + if (ret) + return ret; + /* LoutR control */ if (substream->stream == SNDRV_PCM_STREAM_CAPTURE && params_channels(params) == 2) @@ -611,24 +620,6 @@ static int wm8940_set_dai_pll(struct snd_soc_dai *codec_dai, int pll_id, return 0; } -static int wm8940_set_dai_sysclk(struct snd_soc_dai *codec_dai, - int clk_id, unsigned int freq, int dir) -{ - struct snd_soc_component *component = codec_dai->component; - struct wm8940_priv *wm8940 = snd_soc_component_get_drvdata(component); - - switch (freq) { - case 11289600: - case 12000000: - case 12288000: - case 16934400: - case 18432000: - wm8940->sysclk = freq; - return 0; - } - return -EINVAL; -} - static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai, int div_id, int div) { @@ -653,6 +644,78 @@ static int wm8940_set_dai_clkdiv(struct snd_soc_dai *codec_dai, return ret; } +static unsigned int wm8940_get_mclkdiv(unsigned int f_in, unsigned int f_out, + int *mclkdiv) +{ + unsigned int ratio = 2 * f_in / f_out; + + if (ratio <= 2) { + *mclkdiv = WM8940_MCLKDIV_1; + ratio = 2; + } else if (ratio == 3) { + *mclkdiv = WM8940_MCLKDIV_1_5; + } else if (ratio == 4) { + *mclkdiv = WM8940_MCLKDIV_2; + } else if (ratio <= 6) { + *mclkdiv = WM8940_MCLKDIV_3; + ratio = 6; + } else if (ratio <= 8) { + *mclkdiv = WM8940_MCLKDIV_4; + ratio = 8; + } else if (ratio <= 12) { + *mclkdiv = WM8940_MCLKDIV_6; + ratio = 12; + } else if (ratio <= 16) { + *mclkdiv = WM8940_MCLKDIV_8; + ratio = 16; + } else { + *mclkdiv = WM8940_MCLKDIV_12; + ratio = 24; + } + + return f_out * ratio / 2; +} + +static int wm8940_update_clocks(struct snd_soc_dai *dai) +{ + struct snd_soc_component *codec = dai->component; + struct wm8940_priv *priv = snd_soc_component_get_drvdata(codec); + unsigned int fs256; + unsigned int fpll = 0; + unsigned int f; + int mclkdiv; + + if (!priv->mclk || !priv->fs) + return 0; + + fs256 = 256 * priv->fs; + + f = wm8940_get_mclkdiv(priv->mclk, fs256, &mclkdiv); + if (f != priv->mclk) { + /* The PLL performs best around 90MHz */ + fpll = wm8940_get_mclkdiv(22500000, fs256, &mclkdiv); + } + + wm8940_set_dai_pll(dai, 0, 0, priv->mclk, fpll); + wm8940_set_dai_clkdiv(dai, WM8940_MCLKDIV, mclkdiv); + + return 0; +} + +static int wm8940_set_dai_sysclk(struct snd_soc_dai *dai, int clk_id, + unsigned int freq, int dir) +{ + struct snd_soc_component *codec = dai->component; + struct wm8940_priv *priv = snd_soc_component_get_drvdata(codec); + + if (dir != SND_SOC_CLOCK_IN) + return -EINVAL; + + priv->mclk = freq; + + return wm8940_update_clocks(dai); +} + #define WM8940_RATES SNDRV_PCM_RATE_8000_48000 #define WM8940_FORMATS (SNDRV_PCM_FMTBIT_S8 | \