From patchwork Fri Dec 16 09:46:22 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 33923 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp870220wrn; Fri, 16 Dec 2022 01:51:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf6Nvwdtsg2aazpp/nIsf/8Teq9LGDiTCmM6b+BpPARBIyLgWI5MWn5jdY+dCK9VWZgyQFYp X-Received: by 2002:a17:90b:3187:b0:219:b936:6bcf with SMTP id hc7-20020a17090b318700b00219b9366bcfmr32297616pjb.48.1671184293374; Fri, 16 Dec 2022 01:51:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671184293; cv=none; d=google.com; s=arc-20160816; b=FVyY7mMQjy3n7vTzOYq9MaNQwCfFwZfKtOO3M/ivYfXKNE1iPRSO6GTR44im4mQxqO 4kGyTbauboTXlzUsWzz5P1K7OHm/EoRCq0qoyhWDObL8neaOq4ZXsR3raajuV5sLYgCv 5Nx9VNnG4UsLevhTCfrwhYDW7bvm6URp1XM8QCE9TKFGxzs1slyVSM+8dO+6JD5E4mYq vlvnRgjOldF/3e0rthOykcfIdzLI3bPlF8wMg0SIBvs2c4L8bbTgYLHVboJNZLGAOSdy +Pih1P4j7gSrdnw86nr693vgsEoFLTmZhOQOKh7xcsDDAne69s+PhOF3r4Y7daLVlIZy G3Qw== 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 :message-id:date:subject:cc:to:from:dkim-signature; bh=WOaRp1o2Jv3EJCkvPGwU9coZufEjr6sI22bltN9JL4k=; b=fVoPchpXoA9n97zEvku1bTO2S4cgZMjBWNAMIJgjbtinMQeMmei4HhmVNYkRyhJM+k z0HIVpr+nGV7FMDYXiISUgSlsafc2T7UG8teLnpinPKclbfCzrL1m2jR3RpIvdhonWEl ZQVvi09lgyrl9ssFjKQmbWX+CfuWQOtPoK0g2f3Dn2IOwy/ODqsLbMm7UZtYz9KEE2FN YwaV3ej+FnBwIAhc7zmmp0udLIna2DbVkCQNdcYhql0XTWElKCjUhGpKnSf29M/36Kmt w4diMDWYUkjOFphNFn8RNGcqY8tqw82s2zwV1rbYTAV+ZK26iAY33edVK4oJCYcSXUqI oNkg== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=rNGlylIt; 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 cp2-20020a17090afb8200b0021a005518d0si7467185pjb.50.2022.12.16.01.51.20; Fri, 16 Dec 2022 01:51:33 -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=rNGlylIt; 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 S230217AbiLPJqr (ORCPT + 99 others); Fri, 16 Dec 2022 04:46:47 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36850 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S229613AbiLPJqm (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 B88BF10B73 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 4A937851FC; 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=1671183998; bh=WOaRp1o2Jv3EJCkvPGwU9coZufEjr6sI22bltN9JL4k=; h=From:To:Cc:Subject:Date:From; b=rNGlylItoItOvElXqnnbH37EsM6DM9gINpC6+fj4W3IUHrZyi/8IUhN5tGxSlYzp7 pNxdX1830iKdCZjGrk4HoC0NZfJtgSMGUzA032x4ZUdIo8QBqKUZQDtAiZdxj1X3wm +LJZy1+UFlaOvYqKSWqf1sdF5GGdje0ynQcrJwilfiSqRhAoh8eEVIHmpGC04YW6G6 rOacsev2iK9KSz7zF7mzMFpVKJPzyE4xsackHi5YaJWdWahwa8bydVlP447moPwNSW Np2/Z3zulHY/Q9CTVYLEnY0Ar/V64JbJyvyTgQh+h1nthmPL3RUA7Z88HzVLazgSEq RrlVv7Oe5PKeg== 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 1/3] ASoC: wm8940: Remove warning when no plat data present Date: Fri, 16 Dec 2022 10:46:22 +0100 Message-Id: <20221216094624.3849278-1-lukma@denx.de> X-Mailer: git-send-email 2.30.2 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?1752363741143808870?= X-GMAIL-MSGID: =?utf-8?q?1752363741143808870?= 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 --- Changes for v2: - None Changes for v3: - None --- 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 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 | \ From patchwork Fri Dec 16 09:46:24 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: Lukasz Majewski X-Patchwork-Id: 33924 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:adf:e747:0:0:0:0:0 with SMTP id c7csp870222wrn; Fri, 16 Dec 2022 01:51:33 -0800 (PST) X-Google-Smtp-Source: AA0mqf7H6h7EvAh+kv8/r6QzJgWGGEIHoBUZfZ5/dk3GEpGKkaNsWO6btuRRZV1Er9bVNcrW8ieh X-Received: by 2002:a17:902:8204:b0:188:ec14:bf17 with SMTP id x4-20020a170902820400b00188ec14bf17mr30988188pln.11.1671184293653; Fri, 16 Dec 2022 01:51:33 -0800 (PST) ARC-Seal: i=1; a=rsa-sha256; t=1671184293; cv=none; d=google.com; s=arc-20160816; b=nNrHcDlPrNX0wOoWYZwlCuy08Zs8qliVofB8WkW3iNow4lEV3A5of93/KmwY7LMLDC rNo2+MKeP2T98lUQzhSjltwxz1sMp00qDyNwDrnR5Tr4p3VSnF9owPxpZVd/1P9qJMLG M69avhl1k6m0m3Ej/RkODr+anRJsugvge0T/671FhW9jZVfDYR3NbXfJ0zKNsVzs5/d7 ZnGsY4FJWKvUzhHqwGsemfHz2Pj3/ZVuVs4kj8XVH93bbw0w2GqmhdhniXCzPM8rMmDh UgO9z92E02WgB3ou6KtgHO99OF9+fz2SGm4Vh0EA0IJrQwEuETijJrSP14aF9i4jJXMR jhgg== 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=/H6fBZQRWEmDLxoUqkA4ISnIrcRGBzcSkN81MSyyxEM=; b=JhxNkBKa52ECtcY+3tmmjO71Hgt9JPJ0WwwSag5ugLKBLpAJaC+45C1ySkwTcuphkx 6kLU2RbKUfI3S4lYght9waza5mIFKQeosUulPKQNFdAaME3Bi1ejOBMIXHO30sEbm1i2 F0zsVEHIRZ0tOMQsYQvDd/5UuitcraAEJcTaFp7RJve/PFzod02uXDEL4lkJuhfYsToe 6ed6Q2kC4FZam9hVGCsqdCT/zSwg8LQZ6r1+yTa+nhMH9NNYYFEsftRoZzOHGO5mFoZI hff/SOgC5rEYhKuPCcpzuwcdQqeDxSUaSFxzlMuvGcZ1gcOd0lu4JV5TTHR4EvDELMIb 8+KQ== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@denx.de header.s=phobos-20191101 header.b=fNAU4cYJ; 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 y7-20020a1709027c8700b0017d6ffda9e3si1913741pll.369.2022.12.16.01.51.21; Fri, 16 Dec 2022 01:51:33 -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=fNAU4cYJ; 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 S230233AbiLPJqu (ORCPT + 99 others); Fri, 16 Dec 2022 04:46:50 -0500 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:36862 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S230071AbiLPJqm (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 1CB582CE11 for ; Fri, 16 Dec 2022 01:46:41 -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 48ECD85205; Fri, 16 Dec 2022 10:46:39 +0100 (CET) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=denx.de; s=phobos-20191101; t=1671183999; bh=/H6fBZQRWEmDLxoUqkA4ISnIrcRGBzcSkN81MSyyxEM=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=fNAU4cYJpyQEcY4v4lZZsysJ4r16bYRseOWLGq0HSYwdeMNCAyO5EUouJzYFPioMU hMkozV+HklaqCTbdk3M23L20P6nBwrnCiJ6OBWxtrmjWVU27GcvsELssJeqCQzAFGh 9Lr9w8sLCj8fHEK0WPbbHAiIS42BcXtYCjjcbQBhLXzZeg8OzABuccZB8E8jf/ZGWq 2qgk/dbQlWo/LoTNm6LTkyxNPCmiZMsjNhV1JmPIRtAHSC3I+x0fSeqMgnsYpimBmP cWjhGUjkH/DDNO5zLx/FqTcf5iQdfpedBgVjf7txkeOvXB28+W3fPt+M4vk5/UWwQ7 zqoXWfkOko0sA== 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 3/3] ASoC: wm8940: Read chip ID when wm8940 codec probing Date: Fri, 16 Dec 2022 10:46:24 +0100 Message-Id: <20221216094624.3849278-3-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?1752363741988127389?= X-GMAIL-MSGID: =?utf-8?q?1752363741988127389?= 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 same I2C bus address. Signed-off-by: Lukasz Majewski Acked-by: Charles Keepax --- Changes for v2: - None Changes for v3: - None --- 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 1b02d5e8a007..8eb4782c9232 100644 --- a/sound/soc/codecs/wm8940.c +++ b/sound/soc/codecs/wm8940.c @@ -760,6 +760,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 0d4f53ada2e6..86bbf902ef5a 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 +/* Chip ID */ +#define WM8940_CHIP_ID 0x8940 + #endif /* _WM8940_H */