From patchwork Mon Oct 24 11:29:25 2022 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: Greg KH X-Patchwork-Id: 9724 Return-Path: Delivered-To: ouuuleilei@gmail.com Received: by 2002:a5d:6687:0:0:0:0:0 with SMTP id l7csp547406wru; Mon, 24 Oct 2022 09:38:55 -0700 (PDT) X-Google-Smtp-Source: AMsMyM6vpOImkWIKl6t/GmFjMs8XBEuUDUrKEgpOFf4dfon4YCFYhOJf+VElXhIwvcoPv+GpV5rQ X-Received: by 2002:a17:907:a04b:b0:7a6:d1b8:d08e with SMTP id gz11-20020a170907a04b00b007a6d1b8d08emr6326258ejc.678.1666629535060; Mon, 24 Oct 2022 09:38:55 -0700 (PDT) ARC-Seal: i=1; a=rsa-sha256; t=1666629535; cv=none; d=google.com; s=arc-20160816; b=kgZ69es9iYGTDY2Nc465uFC8EVEHChXntV3rELrl2DgrQyAeOiLiy3qJv4qjzdSdrh xQlQTswTXd6QUDW4RLBW3ZRMFlY3dEan4QHaSbnLLkuMpvJo+DeE7kBRMw23s+dvqu2H UscfJ/yGZlwA7uVrkH9sLwWIz6+tCzgfqPvEbLV2IQhkQ70MRmPuQoxTYxg6ibTqRdaN jwnWfgGI5HxkvVkRnGroqfYua27SM5IsKpRYESxHYiTGfOpi/rvAQZDEXvx2flC61P34 XenllQH4aKhKoarQT6BCX+HVowjd/izT8SQZtdyP6n8Qkdvh9d0oqG1p9N/WXnE13LZN 8NqQ== 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 :user-agent:references:in-reply-to:message-id:date:subject:cc:to :from:dkim-signature; bh=wAePOvO6Qca8fLExex8ntSAfL3+kZHSV2k2mQSwYulY=; b=zg5t8mjLi7K3bAdLWxte1TF+BE55Nvw2oN/aqdVlPORSVMdVMp+Jh20Rp/1fXrGb+Z 9/83pXVQKTNYKVk1jMNrthZQJ42W4j2YJr756t6PHZFpa5YGwETUdj8OJrqlVz0EgRYW Kz8yZIcMmouAVpOX3ZJjVS5pmzegGWo9wEI9KlQIJF0FRy3bBuqaf2bgBj7duW+OtbJR MhQmpyrcFyTi0DckY8ftaRNA64yeJRcGaa5T54xTOG3Z4aWWGMv5OiLGbz7Bia6QGM3v Eh4ETTgVhHTI8AJyvlvsqo8ZTS9KU22oxwXQV/F53gavFShHj+r4zRhCjnWqYGaxHvsr E+Qw== ARC-Authentication-Results: i=1; mx.google.com; dkim=pass header.i=@linuxfoundation.org header.s=korg header.b=i2oO6FVP; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: from out1.vger.email (out1.vger.email. [2620:137:e000::1:20]) by mx.google.com with ESMTP id q7-20020a056402248700b0045e00384e8asi239199eda.380.2022.10.24.09.38.30; Mon, 24 Oct 2022 09:38:55 -0700 (PDT) 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=@linuxfoundation.org header.s=korg header.b=i2oO6FVP; 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; dmarc=pass (p=NONE sp=NONE dis=NONE) header.from=linuxfoundation.org Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S229707AbiJXQgT (ORCPT + 99 others); Mon, 24 Oct 2022 12:36:19 -0400 Received: from lindbergh.monkeyblade.net ([23.128.96.19]:35960 "EHLO lindbergh.monkeyblade.net" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S233801AbiJXQgB (ORCPT ); Mon, 24 Oct 2022 12:36:01 -0400 Received: from ams.source.kernel.org (ams.source.kernel.org [145.40.68.75]) by lindbergh.monkeyblade.net (Postfix) with ESMTPS id C6BDA18952E; Mon, 24 Oct 2022 08:23:11 -0700 (PDT) Received: from smtp.kernel.org (relay.kernel.org [52.25.139.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by ams.source.kernel.org (Postfix) with ESMTPS id 8A9A3B81991; Mon, 24 Oct 2022 12:42:42 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id E141CC433D6; Mon, 24 Oct 2022 12:42:40 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=linuxfoundation.org; s=korg; t=1666615361; bh=Z3VWlFgyQfDBNJ2ypB9u0SJoysJAozXhDOSrwIfEYKs=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=i2oO6FVPn/h6dFeF8UaAYoOaIuwNAFN/21ppjWJCKpoPpvyruAWrsb/46iu/3tE55 s3dR32DzFPjO2ysjdnFphnudOMypg5p2oLhwHsDRhVbCcPWadZec2lohduJ403ymTz EX5jLWAyfT97M9z6TGeeQidAxyWRT/uXTb4mzWcU= From: Greg Kroah-Hartman To: linux-kernel@vger.kernel.org Cc: Greg Kroah-Hartman , stable@vger.kernel.org, =?utf-8?q?Martin_Povi=C5=A1er?= , Mark Brown , Sasha Levin Subject: [PATCH 5.15 221/530] ASoC: tas2764: Fix mute/unmute Date: Mon, 24 Oct 2022 13:29:25 +0200 Message-Id: <20221024113055.103311611@linuxfoundation.org> X-Mailer: git-send-email 2.38.1 In-Reply-To: <20221024113044.976326639@linuxfoundation.org> References: <20221024113044.976326639@linuxfoundation.org> User-Agent: quilt/0.67 MIME-Version: 1.0 X-Spam-Status: No, score=-7.6 required=5.0 tests=BAYES_00,DKIMWL_WL_HIGH, DKIM_SIGNED,DKIM_VALID,DKIM_VALID_AU,DKIM_VALID_EF,RCVD_IN_DNSWL_HI, 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?1747587731485494120?= X-GMAIL-MSGID: =?utf-8?q?1747587731485494120?= From: Martin Povišer [ Upstream commit f5ad67f13623548e5aff847f89700c178aaf2a98 ] Because the PWR_CTRL field is modeled as the power state of the DAC widget, and at the same time it is used to implement mute/unmute, we need some additional book-keeping to have the right end result no matter the sequence of calls. Without this fix, one permanently mutes an ongoing stream by toggling the associated speaker pin control. (This mirrors commit 1e5907bcb3a3 ("ASoC: tas2770: Fix handling of mute/unmute") which was a fix to the tas2770 driver.) Fixes: 827ed8a0fa50 ("ASoC: tas2764: Add the driver for the TAS2764") Signed-off-by: Martin Povišer Link: https://lore.kernel.org/r/20220825140241.53963-4-povik+lin@cutebit.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/tas2764.c | 57 +++++++++++++++++++++----------------- 1 file changed, 32 insertions(+), 25 deletions(-) diff --git a/sound/soc/codecs/tas2764.c b/sound/soc/codecs/tas2764.c index e76ce90c787f..afb4c0d7e714 100644 --- a/sound/soc/codecs/tas2764.c +++ b/sound/soc/codecs/tas2764.c @@ -34,6 +34,9 @@ struct tas2764_priv { int v_sense_slot; int i_sense_slot; + + bool dac_powered; + bool unmuted; }; static void tas2764_reset(struct tas2764_priv *tas2764) @@ -50,6 +53,26 @@ static void tas2764_reset(struct tas2764_priv *tas2764) usleep_range(1000, 2000); } +static int tas2764_update_pwr_ctrl(struct tas2764_priv *tas2764) +{ + struct snd_soc_component *component = tas2764->component; + unsigned int val; + int ret; + + if (tas2764->dac_powered) + val = tas2764->unmuted ? + TAS2764_PWR_CTRL_ACTIVE : TAS2764_PWR_CTRL_MUTE; + else + val = TAS2764_PWR_CTRL_SHUTDOWN; + + ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, + TAS2764_PWR_CTRL_MASK, val); + if (ret < 0) + return ret; + + return 0; +} + #ifdef CONFIG_PM static int tas2764_codec_suspend(struct snd_soc_component *component) { @@ -82,9 +105,7 @@ static int tas2764_codec_resume(struct snd_soc_component *component) usleep_range(1000, 2000); } - ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - TAS2764_PWR_CTRL_ACTIVE); + ret = tas2764_update_pwr_ctrl(tas2764); if (ret < 0) return ret; @@ -118,14 +139,12 @@ static int tas2764_dac_event(struct snd_soc_dapm_widget *w, switch (event) { case SND_SOC_DAPM_POST_PMU: - ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - TAS2764_PWR_CTRL_MUTE); + tas2764->dac_powered = true; + ret = tas2764_update_pwr_ctrl(tas2764); break; case SND_SOC_DAPM_PRE_PMD: - ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - TAS2764_PWR_CTRL_SHUTDOWN); + tas2764->dac_powered = false; + ret = tas2764_update_pwr_ctrl(tas2764); break; default: dev_err(tas2764->dev, "Unsupported event\n"); @@ -170,17 +189,11 @@ static const struct snd_soc_dapm_route tas2764_audio_map[] = { static int tas2764_mute(struct snd_soc_dai *dai, int mute, int direction) { - struct snd_soc_component *component = dai->component; - int ret; - - ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - mute ? TAS2764_PWR_CTRL_MUTE : 0); + struct tas2764_priv *tas2764 = + snd_soc_component_get_drvdata(dai->component); - if (ret < 0) - return ret; - - return 0; + tas2764->unmuted = !mute; + return tas2764_update_pwr_ctrl(tas2764); } static int tas2764_set_bitwidth(struct tas2764_priv *tas2764, int bitwidth) @@ -494,12 +507,6 @@ static int tas2764_codec_probe(struct snd_soc_component *component) if (ret < 0) return ret; - ret = snd_soc_component_update_bits(component, TAS2764_PWR_CTRL, - TAS2764_PWR_CTRL_MASK, - TAS2764_PWR_CTRL_MUTE); - if (ret < 0) - return ret; - return 0; }