From mboxrd@z Thu Jan 1 00:00:00 1970 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 549BECDB482 for ; Wed, 18 Oct 2023 14:17:22 +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 9CDBEE8A; Wed, 18 Oct 2023 16:16:30 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 9CDBEE8A DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1697638640; bh=NpWOL949zjbv0453tfqLRDpLsMUhTAUanBD43aHGEEc=; 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=EwDOWFJNB9Gt5UT/J0q/BYi+W6LIVJb+jznAn25xHtbBzWKQtzjliA7kz8DCpDnlk 8p1MGl8Hdw38D6fY8IF+jnY90NrL/qG51FNNJNve9zf13+OIP/phI/3IQopKvwD/MM tMjlkc8jHkJTxqUg5To7nFsOPcTQzF+k7cPimSEk= Received: by alsa1.perex.cz (Postfix, from userid 50401) id 49F57F805E1; Wed, 18 Oct 2023 16:14:54 +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 B9579F800C9; Wed, 18 Oct 2023 16:14:53 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3AE4DF80564; Wed, 18 Oct 2023 16:14:45 +0200 (CEST) Received: from sin.source.kernel.org (sin.source.kernel.org [145.40.73.55]) (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 A623EF8057B for ; Wed, 18 Oct 2023 16:12:19 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz A623EF8057B Authentication-Results: alsa1.perex.cz; dkim=pass (2048-bit key, unprotected) header.d=kernel.org header.i=@kernel.org header.a=rsa-sha256 header.s=k20201202 header.b=lFKeLM0Z Received: from smtp.kernel.org (transwarp.subspace.kernel.org [100.75.92.58]) by sin.source.kernel.org (Postfix) with ESMTP id D710BCE24E7; Wed, 18 Oct 2023 14:12:15 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id D4B34C433C7; Wed, 18 Oct 2023 14:12:13 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1697638335; bh=NpWOL949zjbv0453tfqLRDpLsMUhTAUanBD43aHGEEc=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=lFKeLM0Zs5+MzEYYy8UhLbqVx3lXaV8xyhtcBeKfwv3rc5pSxCjn008Ndhjc8afrh U7huOkpYkUYnX+rfpZ0QlLc7Od7srXGF0Y33gKhI07SnMYOn0u/Ze98q4U8I62hipG 2mNZ37oOufu2zskr3spQTMMViRR0lPF3Ec6duB8ERchb9JhBCazPT/vjlauQPncBAx p3leaHdLvqngibnlw3T35PBpTlkkOITFVSv+1ChoFi8+PEon3RPIbCGvtHCqqIQ6do 5CeKjYsGbqQ/kPRh+k9wiWTmuTdsEUZvjjoUfYcUKSTm6Wzrkpgolk6Ws5rjpNsYcl PJS8I8IWA6xhw== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Cc: Antoine Gennart , Mark Brown , Sasha Levin , shenghao-ding@ti.com, kevin-lu@ti.com, baojun.xu@ti.com, lgirdwood@gmail.com, perex@perex.cz, tiwai@suse.com, alsa-devel@alsa-project.org Subject: [PATCH AUTOSEL 6.5 09/31] ASoC: tlv320adc3xxx: BUG: Correct micbias setting Date: Wed, 18 Oct 2023 10:11:26 -0400 Message-Id: <20231018141151.1334501-9-sashal@kernel.org> X-Mailer: git-send-email 2.40.1 In-Reply-To: <20231018141151.1334501-1-sashal@kernel.org> References: <20231018141151.1334501-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore X-stable-base: Linux 6.5.7 Content-Transfer-Encoding: 8bit Message-ID-Hash: SWLENBUVKYS7UMBNXXOTXVCTF3NJJMON X-Message-ID-Hash: SWLENBUVKYS7UMBNXXOTXVCTF3NJJMON X-MailFrom: sashal@kernel.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: From: Antoine Gennart [ Upstream commit e930bea4124b8a4a47ba4092d99da30099b9242d ] The micbias setting for tlv320adc can also have the value '3' which means that the micbias ouput pin is connected to the input pin AVDD. Signed-off-by: Antoine Gennart Link: https://lore.kernel.org/r/20230929130117.77661-1-gennartan@disroot.org Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/codecs/tlv320adc3xxx.c | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/sound/soc/codecs/tlv320adc3xxx.c b/sound/soc/codecs/tlv320adc3xxx.c index b976c1946286a..420bbf588efea 100644 --- a/sound/soc/codecs/tlv320adc3xxx.c +++ b/sound/soc/codecs/tlv320adc3xxx.c @@ -293,7 +293,7 @@ #define ADC3XXX_BYPASS_RPGA 0x80 /* MICBIAS control bits */ -#define ADC3XXX_MICBIAS_MASK 0x2 +#define ADC3XXX_MICBIAS_MASK 0x3 #define ADC3XXX_MICBIAS1_SHIFT 5 #define ADC3XXX_MICBIAS2_SHIFT 3 @@ -1099,7 +1099,7 @@ static int adc3xxx_parse_dt_micbias(struct adc3xxx *adc3xxx, unsigned int val; if (!of_property_read_u32(np, propname, &val)) { - if (val >= ADC3XXX_MICBIAS_AVDD) { + if (val > ADC3XXX_MICBIAS_AVDD) { dev_err(dev, "Invalid property value for '%s'\n", propname); return -EINVAL; } -- 2.40.1