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 X-Spam-Level: X-Spam-Status: No, score=-12.1 required=3.0 tests=DKIMWL_WL_HIGH,DKIM_SIGNED, DKIM_VALID,DKIM_VALID_AU,INCLUDES_PATCH,MAILING_LIST_MULTI, MENTIONS_GIT_HOSTING,SIGNED_OFF_BY,SPF_HELO_NONE,SPF_PASS autolearn=ham autolearn_force=no version=3.4.0 Received: from mail.kernel.org (mail.kernel.org [198.145.29.99]) by smtp.lore.kernel.org (Postfix) with ESMTP id 58C49C38A29 for ; Tue, 14 Apr 2020 14:47:31 +0000 (UTC) Received: from vger.kernel.org (vger.kernel.org [23.128.96.18]) by mail.kernel.org (Postfix) with ESMTP id 397992076D for ; Tue, 14 Apr 2020 14:47:31 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586875651; bh=MeT05xutcLyt46QAxJJeGX5eCJ3rJjq4JQ++BK18pMo=; h=Date:From:To:Cc:Subject:In-Reply-To:List-ID:From; b=1n0xDEhN5ww14X5df1GIxNCQfP6pshXMbn2vBnaYfvjTpv4/sa0eFQQeGzErl/6LM vPuEHkuSgm91HpDgfoAgAK3UUFF2vmLlj9FL3rUhwyQtNXOYij3GfeSeltKP2XP3gV Bt83UO3LhU7nKkcxzJ7ZgSZJNOXK8hJmNgTY/Sds= Received: (majordomo@vger.kernel.org) by vger.kernel.org via listexpand id S2404907AbgDNOr2 (ORCPT ); Tue, 14 Apr 2020 10:47:28 -0400 Received: from mail.kernel.org ([198.145.29.99]:44766 "EHLO mail.kernel.org" rhost-flags-OK-OK-OK-OK) by vger.kernel.org with ESMTP id S2404893AbgDNOrW (ORCPT ); Tue, 14 Apr 2020 10:47:22 -0400 Received: from localhost (fw-tnat.cambridge.arm.com [217.140.96.140]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mail.kernel.org (Postfix) with ESMTPSA id 8E3E220787; Tue, 14 Apr 2020 14:47:20 +0000 (UTC) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/simple; d=kernel.org; s=default; t=1586875641; bh=MeT05xutcLyt46QAxJJeGX5eCJ3rJjq4JQ++BK18pMo=; h=Date:From:To:Cc:Subject:In-Reply-To:From; b=TFsPuBZ7FSNOtnSAug8XW4IXwbyWaVpeFFbM9cedU9et3qHJyz1nV2uAJsPo6rIVN gdqQ7KdGTJHWPQR4XxT+sUOSTDXOd6zT7eAGdKDy0PdIPwIkTEC4VtnkHp6sPDwEj9 H50SXjgTY0FPCRLNGDSp0IPfRiLn6Bf0tLf8kIKE= Date: Tue, 14 Apr 2020 15:47:18 +0100 From: Mark Brown To: Dmitry Osipenko Cc: alsa-devel@alsa-project.org, devicetree@vger.kernel.org, Jaroslav Kysela , Jonathan Hunter , Liam Girdwood , linux-kernel@vger.kernel.org, linux-tegra@vger.kernel.org, Mark Brown , Rob Herring , Stephen Warren , Takashi Iwai Subject: Applied "ASoC: tegra: tegra_wm8903: Support nvidia, headset property" to the asoc tree In-Reply-To: <20200330204011.18465-3-digetx@gmail.com> Message-Id: X-Patchwork-Hint: ignore Sender: devicetree-owner@vger.kernel.org Precedence: bulk List-ID: X-Mailing-List: devicetree@vger.kernel.org The patch ASoC: tegra: tegra_wm8903: Support nvidia, headset property has been applied to the asoc tree at https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git All being well this means that it will be integrated into the linux-next tree (usually sometime in the next 24 hours) and sent to Linus during the next merge window (or sooner if it is a bug fix), however if problems are discovered then the patch may be dropped or reverted. You may get further e-mails resulting from automated or manual testing and review of the tree, please engage with people reporting problems and send followup patches addressing any issues that are reported if needed. If any updates are required or you are submitting further changes they should be sent as incremental updates against current git, existing patches will not be replaced. Please add any relevant lists and maintainers to the CCs when replying to this mail. Thanks, Mark >From 3ef9d5073b552d56bd6daf2af1e89b7e8d4df183 Mon Sep 17 00:00:00 2001 From: Dmitry Osipenko Date: Mon, 30 Mar 2020 23:40:11 +0300 Subject: [PATCH] ASoC: tegra: tegra_wm8903: Support nvidia, headset property The microphone-jack state needs to be masked in a case of a 4-pin jack when microphone and ground pins are shorted. Presence of nvidia,headset tells that WM8903 CODEC driver should mask microphone's status if short circuit is detected, i.e headphones are inserted. Signed-off-by: Dmitry Osipenko Link: https://lore.kernel.org/r/20200330204011.18465-3-digetx@gmail.com Signed-off-by: Mark Brown --- sound/soc/tegra/tegra_wm8903.c | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index 9b5651502f12..3aca354f9e08 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c @@ -177,6 +177,7 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_component *component = codec_dai->component; struct snd_soc_card *card = rtd->card; struct tegra_wm8903 *machine = snd_soc_card_get_drvdata(card); + int shrt = 0; if (gpio_is_valid(machine->gpio_hp_det)) { tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det; @@ -189,12 +190,15 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) &tegra_wm8903_hp_jack_gpio); } + if (of_property_read_bool(card->dev->of_node, "nvidia,headset")) + shrt = SND_JACK_MICROPHONE; + snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE, &tegra_wm8903_mic_jack, tegra_wm8903_mic_jack_pins, ARRAY_SIZE(tegra_wm8903_mic_jack_pins)); wm8903_mic_detect(component, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE, - 0); + shrt); snd_soc_dapm_force_enable_pin(&card->dapm, "MICBIAS"); -- 2.20.1