Commit 3b14125b authored by Lars-Peter Clausen's avatar Lars-Peter Clausen Committed by Mark Brown
Browse files

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: default avatarLars-Peter Clausen <lars@metafoo.de>
Signed-off-by: default avatarMark Brown <broonie@kernel.org>
parent bc1e2e06

sound/soc/pxa/ttc-dkb.c

+6 −9
Original line number Diff line number Diff line
@@ -78,15 +78,12 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd) 
	struct snd_soc_codec *codec = rtd->codec;



	/* Headset jack detection */

	snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE

			| SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2,

			&hs_jack);

	snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins),

			      hs_jack_pins);

	snd_soc_jack_new(codec, "Microphone Jack", SND_JACK_MICROPHONE,

			 &mic_jack);

	snd_soc_jack_add_pins(&mic_jack, ARRAY_SIZE(mic_jack_pins),

			      mic_jack_pins);

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

			      SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2,

			      &hs_jack, hs_jack_pins, ARRAY_SIZE(hs_jack_pins));

	snd_soc_card_jack_new(rtd->card, "Microphone Jack", SND_JACK_MICROPHONE,

			      &mic_jack, mic_jack_pins,

			      ARRAY_SIZE(mic_jack_pins));



	/* headphone, microphone detection & headset short detection */

	pm860x_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADPHONE,