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: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
783b1e7948
commit
7ba8cbb2f0
|
@ -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);
|
||||
|
||||
|
|
Loading…
Reference in a new issue