From patchwork Wed Dec 14 12:37:40 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 33181 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp194567wrn; Wed, 14 Dec 2022 04:44:39 -0800 (PST) X-Google-Smtp-Source: AA0mqf4P9BGkwuKwLAHOjT1gCvNLnUAVSYw5U/xGKNl2VTbQVR5j0Ta1ySVwmrbaix/5Us6L+68L X-Received: by 2002:a17:902:b942:b0:186:def0:66f2 with SMTP id h2-20020a170902b94200b00186def066f2mr24325376pls.11.1671021878671; Wed, 14 Dec 2022 04:44:38 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671021878; cv=none; d=google.com; s=arc-20160816; b=moZMjC7rs41az1XyvDd+O2GkQa91W5rB4/1rUsto+Bk3+HN5VngNuHiKkBOjQpa9R0 Lpxxjp9doTYJNFMb7j0NNb//CU7/g77UTIanhV7vSyTJDxbTtonjDfRMXc/HwHkQV4gF Tb2N8GhzEML6SS/eHaGutG5P5I8nywG7eNVutuBjKjhgVZuSzj8xkbZIEWFe1PQhaF13 6+S0owBRAL1HMzCuKhl9APSpnrCUUByIhSrum0SML1M0CszuPehd6kvtmWlZMmvpiw1M o37ZUSgOUSY91yRWO24WZ1T5xUx2hVEDZC4Uk2L70l0foM1G5ekY3kU/cXngFAojjGCX hM4g== 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=/73in4YIE8G8CYnWx0Er3I9VVvTCTYIHLYd83My0KlQ=; b=pCv6Kz1QLN5nh4YBm8UmrCaPfbLbBX1HXXwdRYWJF1O5o1LhAMqwgoPgO1goSIr9Z7 lYK7pO7ri+gCBzut8FFgHpJK4RTKS3TRXwpiAqE9HlQfiadJtC/roat8tL+xa8GH8EMK +8z0ZVGwpf50CC6i7z8K17vNeEOt6v2Bdr9BnSB+qAh1EpYsX3hhzjZhlDt5sO9c24Oz MUgU09yzqTd6U9vixRNrm0bCwES6d2dNIVALLy6NEy5Nl7HCpXD8h9puNzCYbH1H/LdE jZJJFpOGM54+yzbZFJSJtC/+y9F3P3SieriEv0PFNXC/de8Yvsl7d1jDSI77pYzpktYX 1iOA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=y1lyj8rz; 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 k20-20020a170902ba9400b0017684491caasi2446381pls.594.2022.12.14.04.44.24; Wed, 14 Dec 2022 04:44:38 -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=y1lyj8rz; 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 S238297AbiLNMjs (ORCPT + 99 others); Wed, 14 Dec 2022 07:39:48 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40898 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238280AbiLNMjY (ORCPT ); Wed, 14 Dec 2022 07:39:24 -0500 Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7150E1EEDA for ; Wed, 14 Dec 2022 04:38:07 -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 3F7BC85104; Wed, 14 Dec 2022 13:38:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671021485; bh=/73in4YIE8G8CYnWx0Er3I9VVvTCTYIHLYd83My0KlQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=y1lyj8rztDUuWEwQvfddAazUNzjyPhv/ZgvWDuX5GQCWDOp3PCgGI1rbRYGxFtsu3 QFYHzd4roZ/kNz6LwXfmJv6YvE9wvRQEaiFKwoyJSfyU+3zN1s2YEbUWAt+KOYvhuc p2mLHdtMOFJm+vKFyvwyosBmLApcxNNTYfdJXbq27gvmh28aKAAC9xvLAxQu1R4lOa KwtLykZhJc4yy4EkrM5J7pJhwy3eajOTRDufW6MFXFyXy8mydRkMRjWvPLc2jvIa7Y TXL9iGNDHv3M1/z9mz7N11xQIAYC/aqtuDglNmpI74DZ5bR2ySJ0qMeT14c2euyYcu 147ezol8DSALQ== From: Lukasz Majewski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Charles Keepax , Stephen Kitt Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Lukasz Majewski Subject: [PATCH 1/4] ASoC: wm8940: Remove warning when no plat data present Date: Wed, 14 Dec 2022 13:37:40 +0100 Message-Id: <20221214123743.3713843-2-lukma@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221214123743.3713843-1-lukma@denx.de> References: <20221214123743.3713843-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?1752193437047227090?= X-GMAIL-MSGID: =?utf-8?q?1752193437047227090?= The lack of platform data in the contemporary Linux shall not be the reason to display warnings to the kernel logs. Signed-off-by: Lukasz Majewski Acked-by: Charles Keepax --- sound/soc/codecs/wm8940.c | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 8dac9fd88547..0b59020d747f 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -709,9 +709,7 @@ static int wm8940_probe(struct snd_soc_component *component) if (ret < 0) return ret; - if (!pdata) - dev_warn(component->dev, "No platform data supplied\n"); - else { + if (pdata) { reg = snd_soc_component_read(component, WM8940_OUTPUTCTL); ret = snd_soc_component_write(component, WM8940_OUTPUTCTL, reg | pdata->vroi); if (ret < 0) From patchwork Wed Dec 14 12:37:41 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 33185 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp195961wrn; Wed, 14 Dec 2022 04:47:35 -0800 (PST) X-Google-Smtp-Source: AA0mqf4xoY237YOEe8tJo3ygbqP08gRn/couFu06GvQqa0WvA4m42/vY/AcV85+SqaQDCL2kkVkS X-Received: by 2002:a05:6a20:b704:b0:ad:e765:9554 with SMTP id fg4-20020a056a20b70400b000ade7659554mr5436177pzb.55.1671022054902; Wed, 14 Dec 2022 04:47:34 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671022054; cv=none; d=google.com; s=arc-20160816; b=VgippPZlaMspiSsiApMUM0Eyf0nirOWc5oYb0y2euugf5tdi0qBrD+o1Yecj/qHxm3 Xi3qnEBGTUHEvuVJ/KRgykliry44RfgzLTc7DQqP1ekizchn7qxUYmqB8oZzHjQVxsb7 GwwhkHBEaci6kcLxbeC4Wfo9gvottF+bPTWWCTz7S1phQ5d6ERjfpGAMMFnxoLr2dH/r 3vNrDnXWIMJUina6KEdAi8K48DXgV0pwZscE6qzrJi4dJfY6gi8BpTWNLScLUviwK1WO kgK5Wa1F/iIRBi0HcVkYMIwptTFi+sWN2cRk4ziSHfZpovc4VzJy7RAINWGolPZK8Ut9 zzpQ== 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=abd1MpTy2Dv7NXLZctEyPw0kePkmyEM/uEvzbgu2gpY=; b=OBFWW/uNMM6qYY1vznbkbxPItpez3cE1yMqZrza6ALx5ulbD1F8U0DKAYw5svuv6VV Vo8oafo0Iuvlat4cAyU9ktpevqdJGJ/d50Ks5DEt4JYsFLG8EcQ1Cgyf6MGLeUyIZeSu NnIgdnXKA/bEpkMpTuxFEQMBReK9qFahokZzOqb/xQhQPKrAL/t+f9hooRmvhFmXTEx0 uIKTk+3V9ZCXoPRyopKkIRwlGabmt4sWGPGyz8AHzrqJ3/6pUGdrWyLk/0f5v7lob0IM 5po+zBibSUoHEHVaWJeXPvuUM9/7181m+hmXLPAxztrvbhDcN4qonK3MmHf31VgHZdCw OfRg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=geY+9KKL; 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 bc27-20020a656d9b000000b0043a0121bb28si15634165pgb.811.2022.12.14.04.47.20; Wed, 14 Dec 2022 04:47:34 -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=geY+9KKL; 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 S238129AbiLNMkA (ORCPT + 99 others); Wed, 14 Dec 2022 07:40:00 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42072 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238370AbiLNMj1 (ORCPT ); Wed, 14 Dec 2022 07:39:27 -0500 Received: from phobos.denx.de (phobos.denx.de [85.214.62.61]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F7EE2183E for ; Wed, 14 Dec 2022 04:38:07 -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 AE0DE85112; Wed, 14 Dec 2022 13:38:05 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671021486; bh=abd1MpTy2Dv7NXLZctEyPw0kePkmyEM/uEvzbgu2gpY=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=geY+9KKLM0h2RZND9Py7wjG0DwsT68/LnsKJmP7k4omOm3tmyCYT2S1mR2IuRFcRh 3GhfNkhi82QkYov0fRY0Ic4RK6ohZLJHLKRlmFYKoT5mD4k9AoFu/ueH90kfnrBmYq mgpWoXBAJFn5gneZiNZErc38qnUJ8APyE/ltUMiX+GY1HOtWbMqLMFjNCuFRYJxSqI 8nxFCcjgZzkWNy6rdwps9X/neVdSX6Tg4fd0Psywytstk6s132TtZMPXX4FIobcKB8 logZoRTGWjcJVlWT6R1e3pmiYFOrLmNnb7wquV6vBw6hWgUOmY1LeFH1Mg91fww+01 k67UudxYytTTg== From: Lukasz Majewski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Charles Keepax , Stephen Kitt Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Lukasz Majewski Subject: [PATCH 2/4] ASoC: wm8940: Rewrite code to set proper clocks Date: Wed, 14 Dec 2022 13:37:41 +0100 Message-Id: <20221214123743.3713843-3-lukma@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221214123743.3713843-1-lukma@denx.de> References: <20221214123743.3713843-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?1752193622197211721?= X-GMAIL-MSGID: =?utf-8?q?1752193622197211721?= Without this change, the wm8940 driver is not working when set_sysclk callback (wm8940_set_dai_sysclk) is called with frequency not listed in the switch clause. This change adjusts this driver to allow non-standard frequency set (just after the boot) being adjusted afterwards by the sound system core code. Moreover, support for internal wm8940's PLL is provided, so it can generate clocks when HOST system is not able to do it. Code in this commit is based on previous change done for wm8974 (SHA1: 51b2bb3f2568e6d9d81a001d38b8d70c2ba4af99). Signed-off-by: Lukasz Majewski --- sound/soc/codecs/wm8940.c | 103 ++++++++++++++++++++++++++++++-------- 1 file changed, 83 insertions(+), 20 deletions(-) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 0b59020d747f..094e74905df9 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) @@ -496,7 +505,6 @@ static int wm8940_set_bias_level(struct snd_soc_component *component, return ret; } } - /* ensure bufioen and biasen */ pwr_reg |= (1 << 2) | (1 << 3); /* set vmid to 300k for standby */ @@ -611,24 +619,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 +643,79 @@ 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 | \ From patchwork Wed Dec 14 12:37:42 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 33184 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp195683wrn; Wed, 14 Dec 2022 04:46:59 -0800 (PST) X-Google-Smtp-Source: AA0mqf7T+1fsfV+7QwWBdmntBbjkCEo2GhYDEVCpbM1Od9cFkQeTFagxdxL3b7AsoJdMu6n4nB76 X-Received: by 2002:a05:6a20:d398:b0:af:70f0:8a74 with SMTP id iq24-20020a056a20d39800b000af70f08a74mr2234373pzb.36.1671022019587; Wed, 14 Dec 2022 04:46:59 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671022019; cv=none; d=google.com; s=arc-20160816; b=vvujggAnaSGqsyix7BpLmpZyjYXNQUQJM3T4/gQuVMk0RL1MG3GCC3GEECuUpMtmyH /KtD6JgbL3yz9LwqvC/Mgg1me38UORpzU0bk2oT/Mwikxkau+/ekj+zyvGFfxNi+w5kX jURNiSOjyeJ8OVHQjo07cTs9hzouzrGDesewdKkcvopiLfh7RJi1Rm5Y67be33gspS08 aMOR/AGXFrFACyM1lCxSVd/7V4NI6bwcv9IT7sRZA3zRJuHc5HiAV0/brsTkuskhg6UX UhawkvzilpvGhTu3+7Mtd8bezBBuGJa4MEdEjR8Z+mUt4cGyyiXv/uv9hxLsgma+WcHX 5gGg== 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=6Jupxi3YTw8zb2A9Zvbmvr72UlqBukNaZRCAsj7GqjU=; b=oyr7mag+gy/eLK0/B89PcGmkdrcBtTysF4eZt+meK6QJDeIVVeI64+0vDDIo8Vr08B dYDWrLUIp/lX3ZX5iHvA4SbXczL+VYmgiOesxhhAoWQc2BoMYeCzXXiUWBLpv4spLAp4 ZX0fxpF6gWcx04nsb67bgSTK1CpBnOlu2yPNnhoZigNBCrxE4lITl6H8MpQuVE33nV5T PJz7JQQCFJWWRRSgDixBhNBQiLjWAlKdlPvIDnuBtJCuGHXWuVXq3f62JdMtAXM5+X/u 8htDWIHcwVzEbkkYr7huxAqBLuubVJgLxnO6CeGJv5Qk9BxKPK1JYXW+STtUPU9JxpL2 QNmA== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=o5UgHlc7; 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 196-20020a6306cd000000b004705618bd69si15801419pgg.343.2022.12.14.04.46.44; Wed, 14 Dec 2022 04:46:59 -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=o5UgHlc7; 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 S237962AbiLNMjz (ORCPT + 99 others); Wed, 14 Dec 2022 07:39:55 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:40900 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238283AbiLNMj0 (ORCPT ); Wed, 14 Dec 2022 07:39:26 -0500 Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 5F8CB21E00 for ; Wed, 14 Dec 2022 04:38:08 -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 28B5E85165; Wed, 14 Dec 2022 13:38:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671021486; bh=6Jupxi3YTw8zb2A9Zvbmvr72UlqBukNaZRCAsj7GqjU=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=o5UgHlc7BdfCg9o2XR7gT44W6Ksgs3OtjVtv8ynu0m10B2QzPRU+PC/kEWRkvFPfP acl5roqWq/GsUSGan5B3XwKx/OYt2Pt7chpee0qctOneZIh2EKdT+8t3H0H3cIIbfj 25DbmW865Sa3PAJ0S+ZrifUDk0UBtKfpQpMuY6+Dw277FYYfsYVpyqohBIR2f9CNsY MGUkEtxm5m/RVsyl4t9dyespT3Zmwpcur3weMXvUgq9H6DbcZs0hwVb/zKcYtK+WdD JEob0lISivpColvXh/iz+g3tB/r/AOcxp82bZgDE+fL9AJQsqO0bQe6xNT3fMlgCd1 p0QRaC44qiFAA== From: Lukasz Majewski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Charles Keepax , Stephen Kitt Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Lukasz Majewski Subject: [PATCH 3/4] ASoC: wm8940: Mute also the speaker output Date: Wed, 14 Dec 2022 13:37:42 +0100 Message-Id: <20221214123743.3713843-4-lukma@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221214123743.3713843-1-lukma@denx.de> References: <20221214123743.3713843-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?1752193584769020115?= X-GMAIL-MSGID: =?utf-8?q?1752193584769020115?= Without this change the BTL speaker produces some "distortion" noise when test program (speaker-test -t waw) is ended with ctrl+c. As our design uses speaker outputs to drive BTL speaker, it was necessary to also mute the speaker via the codec internal WM8940_SPKVOL register with setting WM8940_SPKMUTE bit. Signed-off-by: Lukasz Majewski --- sound/soc/codecs/wm8940.c | 11 ++++++++++- sound/soc/codecs/wm8940.h | 3 +++ 2 files changed, 13 insertions(+), 1 deletion(-) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 094e74905df9..13cb57210b4b 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -465,9 +465,18 @@ static int wm8940_mute(struct snd_soc_dai *dai, int mute, int direction) { struct snd_soc_component *component = dai->component; u16 mute_reg = snd_soc_component_read(component, WM8940_DAC) & 0xffbf; + u16 spkvol_reg = snd_soc_component_read(component, WM8940_SPKVOL); + int ret; - if (mute) + spkvol_reg &= ~WM8940_SPKMUTE; + if (mute) { mute_reg |= 0x40; + spkvol_reg |= WM8940_SPKMUTE; + } + + ret = snd_soc_component_write(component, WM8940_SPKVOL, spkvol_reg); + if (ret) + return ret; return snd_soc_component_write(component, WM8940_DAC, mute_reg); } diff --git a/sound/soc/codecs/wm8940.h b/sound/soc/codecs/wm8940.h index 0d4f53ada2e6..eb051ed29bb8 100644 --- a/sound/soc/codecs/wm8940.h +++ b/sound/soc/codecs/wm8940.h @@ -95,5 +95,8 @@ struct wm8940_setup_data { #define WM8940_OPCLKDIV_3 2 #define WM8940_OPCLKDIV_4 3 +/* Bit definitions */ +#define WM8940_SPKMUTE BIT(6) + #endif /* _WM8940_H */ From patchwork Wed Dec 14 12:37:43 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 33183 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp194836wrn; Wed, 14 Dec 2022 04:45:11 -0800 (PST) X-Google-Smtp-Source: AA0mqf4U4zLpoddiS+vgXyp7/H74hZzf8tzyUkt57qmJ55WuxqeqVuy4MjC4q87iO4hECSTPzH9d X-Received: by 2002:a05:6a20:bca9:b0:ac:184:d297 with SMTP id fx41-20020a056a20bca900b000ac0184d297mr26215625pzb.38.1671021911125; Wed, 14 Dec 2022 04:45:11 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671021911; cv=none; d=google.com; s=arc-20160816; b=EFc0a0u5dI+2L+3RNpTiwEilGTwjdCfZkm57Y0WRrx742tc9opxESxU509y9tP7TPL naElxI3AI2ZzpmjqAmJiQbkAHMjTnbmU64w2tUO/0Dnv3cnFT+E1PB1jqK57UO1Y7HSl yOVMAbpQJR1RvWXnKKzDU+xMDqgNN5Be+y+a5zmby0D+lPDQLco8kKYDiGHAasTruFW/ 8htl94vGRuOFf0N0UN7k2SXdmkdfhG97GB2MMKScCXjbnCFyRiG3KGW1Y7WSAxgZrB7O pRo0YSWoA2pvJ2YMfUM2zcOhqA/MYDX9CYzD6dxN1Ia+Bk9QAGjp7fv35tbvA5lZKOX9 C4zA== 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=azo7orbjiRSezN63u1QFsZfaSV1rIV/pBSbsk2QFUuQ=; b=uKth1QyoP4UzLecgLwCreQMVJ3nw+ttTc6VHw/T2Q8f4Vug7tNk5uISpaNLTVM5Uu9 gNoYtS/41NkT9UjctSXnqSF7eIoajt4ogsOxuC86ueokHURZkCd6qunEyb8zF1C3G+DB VyMUKwPuj3A0J0S0CXYzZLoErd7zK/3Oyh8aZKazhAGchxK4/E9AggiX++28y4WuTyMi yPv/cosGbBs3PSpyXMf4b44vM2OFtP3PVCJs1pFRN2ZuKBHHR5H+YurHQSgfcs40/J+y awPN34ESbcFS7ompUhzebAfU23P9LmhyeAatl5qAvf8hAWNeq6IhgWFbbIPFy+Qy+90s Og1Q== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b="TPftpv/V"; 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 193-20020a6300ca000000b00479139fe810si15698073pga.619.2022.12.14.04.44.55; Wed, 14 Dec 2022 04:45:11 -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="TPftpv/V"; 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 S238326AbiLNMjw (ORCPT + 99 others); Wed, 14 Dec 2022 07:39:52 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:42052 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S238302AbiLNMj0 (ORCPT ); Wed, 14 Dec 2022 07:39:26 -0500 Received: from phobos.denx.de (phobos.denx.de [IPv6:2a01:238:438b:c500:173d:9f52:ddab:ee01]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id 7C88121E08 for ; Wed, 14 Dec 2022 04:38:08 -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 978F385169; Wed, 14 Dec 2022 13:38:06 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671021487; bh=azo7orbjiRSezN63u1QFsZfaSV1rIV/pBSbsk2QFUuQ=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=TPftpv/VbeTQrvMqbqLhmRtuiZNvMJGxbLDrpQ8ADXPp3FvRUIYsm0CXNFt+46N1E kewJiPCBbL74uQ/zqtkbpGza9v3QmS1f2Ox7BtQolwsxASqF/kpJeVqJkLxY4ZEBlI N4eprHJ00BubbAo8pl93pVWnPm0hXn9e9PSulBgBd1N8I834/dRV3LxlO2yfLRVcl+ dymehn2B7u7L03eb/sv95hriJ18UGDyTeJrIKCfHxOiE4Nym6Ws23uwWrt64gFVXPK rTYJ0YhnJ/O3mk8pmfLsakNruTA9H+Lcu4CQ0DeGE1gfpW/sS1V4QpngjNU0VziuZy 9b3ZbaiiToFEQ== From: Lukasz Majewski To: Liam Girdwood , Mark Brown , Jaroslav Kysela , Takashi Iwai , Charles Keepax , Stephen Kitt Cc: patches@opensource.cirrus.com, alsa-devel@alsa-project.org, linux-kernel@vger.kernel.org, Lukasz Majewski Subject: [PATCH 4/4] ASoC: wm8940: Read chip ID when wm8940 codec probing Date: Wed, 14 Dec 2022 13:37:43 +0100 Message-Id: <20221214123743.3713843-5-lukma@denx.de> X-Mailer: git-send-email 2.30.2 In-Reply-To: <20221214123743.3713843-1-lukma@denx.de> References: <20221214123743.3713843-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?1752193471859518476?= X-GMAIL-MSGID: =?utf-8?q?1752193471859518476?= The wm8940 provides the chip ID information via I2C. In this patch this information is read and if not matching expected value, the probe function is aborted. This prevents from using (i.e. inserting) other wm89* modules which use the sam I2C bus address. Signed-off-by: Lukasz Majewski Acked-by: Charles Keepax --- sound/soc/codecs/wm8940.c | 11 +++++++++++ sound/soc/codecs/wm8940.h | 3 +++ 2 files changed, 14 insertions(+) diff --git a/sound/soc/codecs/wm8940.c b/sound/soc/codecs/wm8940.c index 13cb57210b4b..244998ebab4d 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -769,6 +769,17 @@ static int wm8940_probe(struct snd_soc_component *component) int ret; u16 reg; + /* + * Check chip ID for wm8940 - value of 0x00 offset + * SOFTWARE_RESET on write + * CHIP_ID on read + */ + reg = snd_soc_component_read(component, WM8940_SOFTRESET); + if (reg != WM8940_CHIP_ID) { + dev_err(component->dev, "Wrong wm8940 chip ID: 0x%x\n", reg); + return -ENODEV; + } + ret = wm8940_reset(component); if (ret < 0) { dev_err(component->dev, "Failed to issue reset\n"); diff --git a/sound/soc/codecs/wm8940.h b/sound/soc/codecs/wm8940.h index eb051ed29bb8..8fbddcaa7449 100644 --- a/sound/soc/codecs/wm8940.h +++ b/sound/soc/codecs/wm8940.h @@ -98,5 +98,8 @@ struct wm8940_setup_data { /* Bit definitions */ #define WM8940_SPKMUTE BIT(6) +/* Chip ID */ +#define WM8940_CHIP_ID 0x8940 + #endif /* _WM8940_H */