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 08ED0C77B75 for ; Sun, 7 May 2023 00:32:29 +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 8D4C91801; Sun, 7 May 2023 02:31:31 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa0.perex.cz 8D4C91801 DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=alsa-project.org; s=default; t=1683419541; bh=40z2ZpojbXuP6tB3+OAoSZu6KHvjy/jbjRj5UZ9K8Nw=; h=From:To:Subject:Date:In-Reply-To:References:CC:List-Id: List-Archive:List-Help:List-Owner:List-Post:List-Subscribe: List-Unsubscribe:From; b=UarsEMSZnZpepH29MDQQgXQMPVnkrMT7sHsekH69OglpfBdtzLX9AXJb+erJ1VuRR HgTo5Zkbbn3grAJFimlPB/eAinDuazOtjcBy4XRbouBxWQrhvyyTR33G7omM5tCeY6 pS3arRH8P+1jegSsjercNy44e07YPoaodGhCFdO8= Received: from mailman-core.alsa-project.org (mailman-core.alsa-project.org [10.254.200.10]) by alsa1.perex.cz (Postfix) with ESMTP id DD305F8032D; Sun, 7 May 2023 02:30:55 +0200 (CEST) Received: by alsa1.perex.cz (Postfix, from userid 50401) id 3C4C5F8053B; Sun, 7 May 2023 02:30:52 +0200 (CEST) Received: from dfw.source.kernel.org (dfw.source.kernel.org [139.178.84.217]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by alsa1.perex.cz (Postfix) with ESMTPS id ADAF9F8032D for ; Sun, 7 May 2023 02:30:48 +0200 (CEST) DKIM-Filter: OpenDKIM Filter v2.11.0 alsa1.perex.cz ADAF9F8032D 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=QVTAkYbO 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 dfw.source.kernel.org (Postfix) with ESMTPS id E65E26144C; Sun, 7 May 2023 00:30:46 +0000 (UTC) Received: by smtp.kernel.org (Postfix) with ESMTPSA id B3C3AC433D2; Sun, 7 May 2023 00:30:44 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=k20201202; t=1683419446; bh=40z2ZpojbXuP6tB3+OAoSZu6KHvjy/jbjRj5UZ9K8Nw=; h=From:To:Cc:Subject:Date:In-Reply-To:References:From; b=QVTAkYbOShHbUbOAvnhBRP9RJkfGyoEvK7luZCENgeRI8eqOMoZ03fqUiA3wbAymH TJ7vM+/TSA3nRPucUa9achYeod+TCxvV6gRKcEc8xB3JbBd/AWwAQXkPLX/bKev5pc tJGYbtp8Qc83qqUKHilTfGf5v3qe3ot+e/b6m3So6fPwCk28srOsb9wiBpSQa+Jxt/ 0nYbwtPLWaLFSe6YpSwhD6R76qg6Z6u5b6xscm0si8wA9uKfr1jQ/e8D3MDWyTZL1J 0tJ5rRwKl4f3WtuAbszhy0YNkf5GqKn/cY/SDnzCru4gJ6gEr69rS1/Lq/RwhGtC26 MupRadkco2DyQ== From: Sasha Levin To: linux-kernel@vger.kernel.org, stable@vger.kernel.org Subject: [PATCH AUTOSEL 6.3 06/24] ASoC: tegra: Support coupled mic-hp detection Date: Sat, 6 May 2023 20:30:02 -0400 Message-Id: <20230507003022.4070535-6-sashal@kernel.org> X-Mailer: git-send-email 2.39.2 In-Reply-To: <20230507003022.4070535-1-sashal@kernel.org> References: <20230507003022.4070535-1-sashal@kernel.org> MIME-Version: 1.0 X-stable: review X-Patchwork-Hint: Ignore Content-Transfer-Encoding: 8bit Message-ID-Hash: SOWEU7GREZPB2QCMSEGNGSZORCPYJWJG X-Message-ID-Hash: SOWEU7GREZPB2QCMSEGNGSZORCPYJWJG 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 CC: Svyatoslav Ryhel , Mark Brown , Sasha Levin , lgirdwood@gmail.com, tiwai@suse.com, thierry.reding@gmail.com, jonathanh@nvidia.com, jiapeng.chong@linux.alibaba.com, ion@agorria.com, robh@kernel.org, alsa-devel@alsa-project.org, linux-tegra@vger.kernel.org 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: Svyatoslav Ryhel [ Upstream commit eb0b8481c2e03a5ae01f6bea60b42109bd12b6fe ] This quirk is used for cases when there is GPIO which detects any type of 3.5 Jack insertion and actual type of jack is defined by other GPIO. 3.5 Jack GPIO generates interrupt and MIC GPIO indicates type of Jack only if 3.5 Jack GPIO is active. Signed-off-by: Svyatoslav Ryhel Link: https://lore.kernel.org/r/20230308073502.5421-3-clamor95@gmail.com Signed-off-by: Mark Brown Signed-off-by: Sasha Levin --- sound/soc/tegra/tegra_asoc_machine.c | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index 78faa8bcae274..7b6d5d90c3a2d 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -51,6 +51,17 @@ static struct snd_soc_jack_gpio tegra_machine_headset_jack_gpio = { }; /* Mic Jack */ +static int coupled_mic_hp_check(void *data) +{ + struct tegra_machine *machine = (struct tegra_machine *)data; + + /* Detect mic insertion only if 3.5 jack is in */ + if (gpiod_get_value_cansleep(machine->gpiod_hp_det) && + gpiod_get_value_cansleep(machine->gpiod_mic_det)) + return SND_JACK_MICROPHONE; + + return 0; +} static struct snd_soc_jack tegra_machine_mic_jack; @@ -183,8 +194,15 @@ int tegra_asoc_machine_init(struct snd_soc_pcm_runtime *rtd) return err; } + tegra_machine_mic_jack_gpio.data = machine; tegra_machine_mic_jack_gpio.desc = machine->gpiod_mic_det; + if (of_property_read_bool(card->dev->of_node, + "nvidia,coupled-mic-hp-det")) { + tegra_machine_mic_jack_gpio.desc = machine->gpiod_hp_det; + tegra_machine_mic_jack_gpio.jack_status_check = coupled_mic_hp_check; + }; + err = snd_soc_jack_add_gpios(&tegra_machine_mic_jack, 1, &tegra_machine_mic_jack_gpio); if (err) -- 2.39.2