From patchwork Wed Sep 13 17:15:51 2023 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 7bit X-Patchwork-Submitter: John Watts X-Patchwork-Id: 722130 Return-Path: X-Spam-Checker-Version: SpamAssassin 3.4.0 (2014-02-07) on aws-us-west-2-korg-lkml-1.web.codeaurora.org Received: from alsa0.perex.cz (alsa0.perex.cz [77.48.224.243]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by smtp.lore.kernel.org (Postfix) with ESMTPS id 398A2EE01F1 for ; Wed, 13 Sep 2023 17:18:13 +0000 (UTC) Received: from alsa1.perex.cz (alsa1.perex.cz [207.180.221.201]) (using TLSv1.2 with cipher ADH-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by alsa0.perex.cz (Postfix) with ESMTPS id 16C87DF2; Wed, 13 Sep 2023 19:17:21 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 16C87DF2 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1694625491; bh=VdPnDR7EvN8kuof2TFWTZ5dCSF/ImyErGYTlppRy29A=; h=From:To:Cc:Subject:Date:In-Reply-To:References:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=RtrvHNFtMO6XCvHSyUiMZeByDs9zzXkVqBv4O90GB6Jl02YF0fKrIL8wQh+JxAMP9 uwpfGmO/TUKQm3r3vBlQUreCxADtYaNODvyaSmxXefeE91WoXdAxLmfN5/D92hH3vR eb2a/n62xqseFCgTrnbdjujN3uYsAxbq+ylxPyYE= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 54D26F80571; Wed, 13 Sep 2023 19:16:30 +0200 (CEST) Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DBB84F80578; Wed, 13 Sep 2023 19:16:29 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id E3892F80578; Wed, 13 Sep 2023 19:16:25 +0200 (CEST) Received: from out-216.mta0.migadu.com (out-216.mta0.migadu.com [IPv6:2001:41d0:1004:224b::d8]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id 37318F80570 for ; Wed, 13 Sep 2023 19:16:22 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz 37318F80570 Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=jookia.org header.i=@jookia.org header.a=rsa-sha256 header.s=key1 header.b=ZFkMudF4 X-Report-Abuse: Please report any abuse attempt to abuse@migadu.com and include these headers. DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=jookia.org; s=key1; t=1694625381; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=3FeZkXz+JQqXeiU3HazldI8mgv0sJ787/pyCTmTegd4=; b=ZFkMudF4vLRf2wwyLkRMjGNESmuzTssdLkRAglApAJ8yPv6gK4CSmiVmSozhR/msO9T1X0 cwe809Oob+FAKFsjPNz50zFhGBQ6/MCMc1ZqLlbRyDxgja44nq1wiNyMteDtGAob8nGyaR 5ImsryHJjxA4FjkZpt6MY9Hi3jc7QgOLDHRYjP0oZj9ntRl9OdCRjCGGJTBvNDI7CnYOZx FOb9TDIIXM03aX7F+vEO2AP+PNTKhYSIlmGy1TYSmYKNeUMbI0/XCxvfLNV13unO0eurm3 X5O334si6FTqxRHh0IBJoZ9i+yGS3mhJ6pvlWEJo5n/we4vWKmDit3H4xCe/Rg== From: John Watts To: alsa-devel@alsa-project.org Cc: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Jaroslav Kysela , Takashi Iwai , John Watts , patches@opensource.cirrus.com, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org Subject: [PATCH v2 2/3] ASoC: wm8782: Use wlf,fsampen device tree property Date: Thu, 14 Sep 2023 03:15:51 +1000 Message-ID: <20230913171552.92252-3-contact@jookia.org> In-Reply-To: <20230913171552.92252-1-contact@jookia.org> References: <20230913171552.92252-1-contact@jookia.org> MIME-Version: 1.0 X-Migadu-Flow: FLOW_OUT Message-ID-Hash: KM6LEUN3RJ3L5PBZA5S7AVOX7ZS7QPQ4 X-Message-ID-Hash: KM6LEUN3RJ3L5PBZA5S7AVOX7ZS7QPQ4 X-MailFrom: contact@jookia.org X-Mailman-Rule-Misses: dmarc-mitigation; no-senders; approved; emergency; loop; banned-address; member-moderation; header-match-alsa-devel.alsa-project.org-0; header-match-alsa-devel.alsa-project.org-1; nonmember-moderation; administrivia; implicit-dest; max-recipients; max-size; news-moderation; no-subject; digests; suspicious-header X-Mailman-Version: 3.3.8 Precedence: list List-Id: "Alsa-devel mailing list for ALSA developers - http://www.alsa-project.org" Archived-At: List-Archive: List-Help: List-Owner: List-Post: List-Subscribe: List-Unsubscribe: The wm8782 supports rates 96kHz and 192kHz as long as the hardware is configured properly. Allow this to be specified in the device tree. Signed-off-by: John Watts --- sound/soc/codecs/wm8782.c | 25 ++++++++++++++++++++++--- 1 file changed, 22 insertions(+), 3 deletions(-) diff --git a/sound/soc/codecs/wm8782.c b/sound/soc/codecs/wm8782.c index 63ab63f3189a..249b58b093d6 100644 --- a/sound/soc/codecs/wm8782.c +++ b/sound/soc/codecs/wm8782.c @@ -122,8 +122,9 @@ static const struct snd_soc_component_driver soc_component_dev_wm8782 = { static int wm8782_probe(struct platform_device *pdev) { struct device *dev = &pdev->dev; + struct device_node *np = dev->of_node; struct wm8782_priv *priv; - int ret, i; + int ret, i, fsampen; priv = devm_kzalloc(dev, sizeof(*priv), GFP_KERNEL); if (!priv) @@ -139,8 +140,26 @@ static int wm8782_probe(struct platform_device *pdev) if (ret < 0) return ret; - /* For configurations with FSAMPEN=0 */ - priv->max_rate = 48000; + // Assume lowest value by default to avoid inadvertent overclocking + fsampen = 0; + + if (np) + of_property_read_u32(np, "wlf,fsampen", &fsampen); + + switch (fsampen) { + case 0: + priv->max_rate = 48000; + break; + case 1: + priv->max_rate = 96000; + break; + case 2: + priv->max_rate = 192000; + break; + default: + dev_err(dev, "Invalid wlf,fsampen value"); + return -EINVAL; + } return devm_snd_soc_register_component(&pdev->dev, &soc_component_dev_wm8782, &wm8782_dai, 1);