Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit 7ba8cbb2 authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

ASoC: tegra_wm8903: Register jacks at the card level 



The jacks are card level elements so use snd_soc_card_jack_new() instead of
snd_soc_jack_new() to register them.

Signed-off-by: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent 783b1e79

sound/soc/tegra/tegra_wm8903.c

+8 −10
Original line number Diff line number Diff line
@@ -177,21 +177,19 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) 


	if (gpio_is_valid(machine->gpio_hp_det)) {

		tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det;

		snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,

				&tegra_wm8903_hp_jack);

		snd_soc_jack_add_pins(&tegra_wm8903_hp_jack,

					ARRAY_SIZE(tegra_wm8903_hp_jack_pins),

					tegra_wm8903_hp_jack_pins);

		snd_soc_card_jack_new(rtd->card, "Headphone Jack",

				      SND_JACK_HEADPHONE, &tegra_wm8903_hp_jack,

				      tegra_wm8903_hp_jack_pins,

				      ARRAY_SIZE(tegra_wm8903_hp_jack_pins));

		snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack,

					1,

					&tegra_wm8903_hp_jack_gpio);

	}



	snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,

			 &tegra_wm8903_mic_jack);

	snd_soc_jack_add_pins(&tegra_wm8903_mic_jack,

			      ARRAY_SIZE(tegra_wm8903_mic_jack_pins),

			      tegra_wm8903_mic_jack_pins);

	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(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,

				0);