提交 3b14125b 编写于 作者: L Lars-Peter Clausen 提交者: Mark Brown

ASoC: ttc-dkb: 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: NLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: NMark Brown <broonie@kernel.org>
上级 bc1e2e06
...@@ -78,15 +78,12 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd) ...@@ -78,15 +78,12 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_codec *codec = rtd->codec; struct snd_soc_codec *codec = rtd->codec;
/* Headset jack detection */ /* Headset jack detection */
snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE |
| SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2, SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2,
&hs_jack); &hs_jack, hs_jack_pins, ARRAY_SIZE(hs_jack_pins));
snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), snd_soc_card_jack_new(rtd->card, "Microphone Jack", SND_JACK_MICROPHONE,
hs_jack_pins); &mic_jack, mic_jack_pins,
snd_soc_jack_new(codec, "Microphone Jack", SND_JACK_MICROPHONE, ARRAY_SIZE(mic_jack_pins));
&mic_jack);
snd_soc_jack_add_pins(&mic_jack, ARRAY_SIZE(mic_jack_pins),
mic_jack_pins);
/* headphone, microphone detection & headset short detection */ /* headphone, microphone detection & headset short detection */
pm860x_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADPHONE, pm860x_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADPHONE,
......
Markdown is supported
0% .
You are about to add 0 people to the discussion. Proceed with caution.
先完成此消息的编辑!
想要评论请 注册