ASoC: tegra: tegra_wm8903: Support nvidia, headset property (3ef9d507) · Commits · 戴 / test

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 <digetx@gmail.com> Link: https://lore.kernel.org/r/20200330204011.18465-3-digetx@gmail.com Signed-off-by:

Mark Brown <broonie@kernel.org>

sound/soc/tegra/tegra_wm8903.c

+5 −1

Original line number	Diff line number	Diff line
		@@ -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");

Admin message