mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-10-28 07:13:34 +00:00
ASoC: speyside: 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
55b2ed2d9d
commit
663976ad47
1 changed files with 4 additions and 10 deletions
|
@ -153,16 +153,10 @@ static int speyside_wm8996_init(struct snd_soc_pcm_runtime *rtd)
|
||||||
pr_err("Failed to request HP_SEL GPIO: %d\n", ret);
|
pr_err("Failed to request HP_SEL GPIO: %d\n", ret);
|
||||||
gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity);
|
gpio_direction_output(WM8996_HPSEL_GPIO, speyside_jack_polarity);
|
||||||
|
|
||||||
ret = snd_soc_jack_new(codec, "Headset",
|
ret = snd_soc_card_jack_new(rtd->card, "Headset", SND_JACK_LINEOUT |
|
||||||
SND_JACK_LINEOUT | SND_JACK_HEADSET |
|
SND_JACK_HEADSET | SND_JACK_BTN_0,
|
||||||
SND_JACK_BTN_0,
|
&speyside_headset, speyside_headset_pins,
|
||||||
&speyside_headset);
|
ARRAY_SIZE(speyside_headset_pins));
|
||||||
if (ret)
|
|
||||||
return ret;
|
|
||||||
|
|
||||||
ret = snd_soc_jack_add_pins(&speyside_headset,
|
|
||||||
ARRAY_SIZE(speyside_headset_pins),
|
|
||||||
speyside_headset_pins);
|
|
||||||
if (ret)
|
if (ret)
|
||||||
return ret;
|
return ret;
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue