From patchwork Tue Mar 4 15:15:57 2025 Content-Type: text/plain; charset="utf-8" MIME-Version: 1.0 Content-Transfer-Encoding: 8bit X-Patchwork-Submitter: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Patchwork-Id: 14001187 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 bombadil.infradead.org (bombadil.infradead.org [198.137.202.133]) (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 7C1BBC282D2 for ; Tue, 4 Mar 2025 17:29:52 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; q=dns/txt; c=relaxed/relaxed; d=lists.infradead.org; s=bombadil.20210309; h=Sender:List-Subscribe:List-Help :List-Post:List-Archive:List-Unsubscribe:List-Id:Cc:To:In-Reply-To:References :Message-Id:Content-Transfer-Encoding:Content-Type:MIME-Version:Subject:Date: From:Reply-To:Content-ID:Content-Description:Resent-Date:Resent-From: Resent-Sender:Resent-To:Resent-Cc:Resent-Message-ID:List-Owner; bh=b3Jr1ifBgAUOTlSFImIY854lPBEJ8Tg18l+oA7ulQUw=; b=jLhP8hv4R2DoSg+fUEoamu+ph6 iFxQZLV/un3Dx1/l8VFrANYePmU4gAvgJzWbUHoBdiCVVOq0zL58eFWDVqP7I473I91E6Sx04HZp9 ss3cY+hSGPz5d2KNvQQwUyMU3wP09RiTVRf9AhRYgI94qh17rViEXAfHsX4Or9Zz4KrQJnxrNSQBP sKZxJpf3uj0F6sTIo4+qfyLe2hvaG9PPhnnfwo+i1SEVPM0wQbXV4N6VE65mjHY8WxqLfuYy+52A/ LqCUQ70v5i3RajxDnWuRR533Q079BZQSVw5vtNgZLwk/v2OcDv5uHf6ZoG0y/BCwMqGvrX9tWRTvV tLlBRS+g==; Received: from localhost ([::1] helo=bombadil.infradead.org) by bombadil.infradead.org with esmtp (Exim 4.98 #2 (Red Hat Linux)) id 1tpW5Q-00000005dAN-3uMz; Tue, 04 Mar 2025 17:29:44 +0000 Received: from bali.collaboradmins.com ([2a01:4f8:201:9162::2]) by bombadil.infradead.org with esmtps (Exim 4.98 #2 (Red Hat Linux)) id 1tpU1a-00000005AOf-0DSZ; Tue, 04 Mar 2025 15:17:39 +0000 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=collabora.com; s=mail; t=1741101456; bh=rBci4f69I/d/dQvGhQC94bd2AW9ZiKT0dsBk2rxvf9k=; h=From:Date:Subject:References:In-Reply-To:To:Cc:From; b=Inzks9Mhv1iMCQ3p9MrvMcYWBdpfIaJdhf8iMX+Gf+yyhHcHW1VKGh+91ONxkiLtS lHAQfgqxt9ZHjidpXd28ba/gKIp/0sx4Zgu7+mdyj2KErN7cWmnOa68se6kufbiuH7 3IA5yA1wJeLr/HJ6PMwoIl2RiemhNCysXuQHd/GI9Pi4clynPxnzwdnWRf+jhtwTF2 hBCQd+4xtUi0EHThhEh5hV310T4lD/5YBDEivhg6DzguksJExCb3vdkhqU9yLKqRCQ YrJKluc5nck6jKrkklOxl0nfshmbelcwsbU9CtE2IzLVcSgUZfYlystfOp7v3059Fo ieY1vA8yNzohg== Received: from [192.168.0.47] (unknown [IPv6:2804:14c:1a9:53ee::1001]) (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) (Authenticated sender: nfraprado) by bali.collaboradmins.com (Postfix) with ESMTPSA id 81A3717E0630; Tue, 4 Mar 2025 16:17:31 +0100 (CET) From: =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= Date: Tue, 04 Mar 2025 12:15:57 -0300 Subject: [PATCH v3 16/20] ASoC: mediatek: mt6359-accdet: Always configure hardware as mic-mode 2 MIME-Version: 1.0 Message-Id: <20250304-mt6359-accdet-dts-v3-16-5b0eafc29f5b@collabora.com> References: <20250304-mt6359-accdet-dts-v3-0-5b0eafc29f5b@collabora.com> In-Reply-To: <20250304-mt6359-accdet-dts-v3-0-5b0eafc29f5b@collabora.com> To: Liam Girdwood , Mark Brown , Rob Herring , Krzysztof Kozlowski , Conor Dooley , Matthias Brugger , AngeloGioacchino Del Regno , Sen Chu , Sean Wang , Macpaul Lin , Lee Jones , Jaroslav Kysela , Takashi Iwai , Catalin Marinas , Will Deacon Cc: kernel@collabora.com, linux-sound@vger.kernel.org, devicetree@vger.kernel.org, linux-kernel@vger.kernel.org, linux-arm-kernel@lists.infradead.org, linux-mediatek@lists.infradead.org, linux-pm@vger.kernel.org, =?utf-8?b?TsOtY29sYXMgRi4gUi4gQS4gUHJhZG8=?= X-Mailer: b4 0.14.2 X-CRM114-Version: 20100106-BlameMichelson ( TRE 0.8.0 (BSD) ) MR-646709E3 X-CRM114-CacheID: sfid-20250304_071738_233991_E3344BCF X-CRM114-Status: GOOD ( 15.26 ) X-BeenThere: linux-arm-kernel@lists.infradead.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , Sender: "linux-arm-kernel" Errors-To: linux-arm-kernel-bounces+linux-arm-kernel=archiver.kernel.org@lists.infradead.org The driver currently reads a mediatek,mic-mode property from DT to determine certain register configurations. Since there are no current users of the property, the property doesn't directly reflect the hardware and the default value (2) is known to work on multiple boards, remove the code handling this property and instead always configure the hardware according to the known to work default. This property can be properly introduced in the binding in the future if it really turns out that different boards need different configurations. Reviewed-by: AngeloGioacchino Del Regno Signed-off-by: Nícolas F. R. A. Prado --- sound/soc/codecs/mt6359-accdet.c | 43 ++++++---------------------------------- sound/soc/codecs/mt6359-accdet.h | 5 ----- 2 files changed, 6 insertions(+), 42 deletions(-) diff --git a/sound/soc/codecs/mt6359-accdet.c b/sound/soc/codecs/mt6359-accdet.c index a31e084560c7643b14fb71871699e3167075d9d9..12697b02faff1be39317116cd7d8ffa359f2cd4e 100644 --- a/sound/soc/codecs/mt6359-accdet.c +++ b/sound/soc/codecs/mt6359-accdet.c @@ -494,11 +494,6 @@ static int mt6359_accdet_parse_dt(struct mt6359_accdet *priv) if (!node) return -EINVAL; - ret = of_property_read_u32(node, "mediatek,mic-mode", - &priv->data->mic_mode); - if (ret) - priv->data->mic_mode = 2; - priv->data->hp_eint_high = of_property_read_bool(node, "mediatek,hp-eint-high"); ret = of_property_read_u32(node, "mediatek,eint-num", &tmp); @@ -658,38 +653,12 @@ static void mt6359_accdet_init(struct mt6359_accdet *priv) RG_AUDMICBIAS1LOWPEN_MASK_SFT); /* mic mode setting */ regmap_read(priv->regmap, RG_AUDACCDETMICBIAS0PULLLOW_ADDR, ®); - if (priv->data->mic_mode == HEADSET_MODE_1) { - /* ACC mode*/ - regmap_write(priv->regmap, RG_AUDACCDETMICBIAS0PULLLOW_ADDR, - reg | RG_ACCDET_MODE_ANA11_MODE1); - /* enable analog fast discharge */ - regmap_update_bits(priv->regmap, RG_ANALOGFDEN_ADDR, - RG_ANALOGFDEN_MASK_SFT, - BIT(RG_ANALOGFDEN_SFT)); - regmap_update_bits(priv->regmap, RG_ACCDETSPARE_ADDR, - 0x3 << 11, 0x3 << 11); - } else if (priv->data->mic_mode == HEADSET_MODE_2) { - /* DCC mode Low cost mode without internal bias */ - regmap_write(priv->regmap, RG_AUDACCDETMICBIAS0PULLLOW_ADDR, - reg | RG_ACCDET_MODE_ANA11_MODE2); - /* enable analog fast discharge */ - regmap_update_bits(priv->regmap, RG_ANALOGFDEN_ADDR, - 0x3 << RG_ANALOGFDEN_SFT, - 0x3 << RG_ANALOGFDEN_SFT); - } else if (priv->data->mic_mode == HEADSET_MODE_6) { - /* DCC mode Low cost mode with internal bias, - * bit8 = 1 to use internal bias - */ - regmap_write(priv->regmap, RG_AUDACCDETMICBIAS0PULLLOW_ADDR, - reg | RG_ACCDET_MODE_ANA11_MODE6); - regmap_update_bits(priv->regmap, RG_AUDPWDBMICBIAS1_ADDR, - RG_AUDMICBIAS1DCSW1PEN_MASK_SFT, - BIT(RG_AUDMICBIAS1DCSW1PEN_SFT)); - /* enable analog fast discharge */ - regmap_update_bits(priv->regmap, RG_ANALOGFDEN_ADDR, - 0x3 << RG_ANALOGFDEN_SFT, - 0x3 << RG_ANALOGFDEN_SFT); - } + /* DCC mode Low cost mode without internal bias */ + regmap_write(priv->regmap, RG_AUDACCDETMICBIAS0PULLLOW_ADDR, + reg | RG_ACCDET_MODE_ANA11_MODE2); + /* enable analog fast discharge */ + regmap_update_bits(priv->regmap, RG_ANALOGFDEN_ADDR, + 0x3 << RG_ANALOGFDEN_SFT, 0x3 << RG_ANALOGFDEN_SFT); config_eint_init_by_mode(priv); config_digital_init_by_mode(priv); diff --git a/sound/soc/codecs/mt6359-accdet.h b/sound/soc/codecs/mt6359-accdet.h index 46dcd4759230a5190434b9b7c785e8b9ed12fd3d..579373807c414130b2a7384db4978e01cf1d046c 100644 --- a/sound/soc/codecs/mt6359-accdet.h +++ b/sound/soc/codecs/mt6359-accdet.h @@ -12,10 +12,6 @@ #define ACCDET_DEVNAME "accdet" -#define HEADSET_MODE_1 (1) -#define HEADSET_MODE_2 (2) -#define HEADSET_MODE_6 (6) - #define MT6359_ACCDET_NUM_BUTTONS 4 #define MT6359_ACCDET_JACK_MASK (SND_JACK_HEADPHONE | \ SND_JACK_HEADSET | \ @@ -51,7 +47,6 @@ enum { }; struct dts_data { - unsigned int mic_mode; bool hp_eint_high; unsigned int eint_comp_vth; };