diff options
| author | Mark Brown <broonie@kernel.org> | 2015-04-08 21:09:54 +0100 |
|---|---|---|
| committer | Mark Brown <broonie@kernel.org> | 2015-04-08 21:09:54 +0100 |
| commit | c77dc2c203908fe03582770b016ffc7c84242939 (patch) | |
| tree | c85e844917bb40dbc9f9dc19cdc10af87f5624ea /sound/soc/fsl/wm1133-ev1.c | |
| parent | 012baec5c1eaab7ad98b461eb7afae2faf79dbea (diff) | |
| parent | 77c71765ef78f87dd901fcb4c751908e835a3b2e (diff) | |
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-tegra
Diffstat (limited to 'sound/soc/fsl/wm1133-ev1.c')
| -rw-r--r-- | sound/soc/fsl/wm1133-ev1.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sound/soc/fsl/wm1133-ev1.c b/sound/soc/fsl/wm1133-ev1.c index a958937ab405..0653aa83c927 100644 --- a/sound/soc/fsl/wm1133-ev1.c +++ b/sound/soc/fsl/wm1133-ev1.c @@ -205,16 +205,14 @@ static int wm1133_ev1_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_dapm_context *dapm = &codec->dapm; /* Headphone jack detection */ - snd_soc_jack_new(codec, "Headphone", SND_JACK_HEADPHONE, &hp_jack); - snd_soc_jack_add_pins(&hp_jack, ARRAY_SIZE(hp_jack_pins), - hp_jack_pins); + snd_soc_card_jack_new(rtd->card, "Headphone", SND_JACK_HEADPHONE, + &hp_jack, hp_jack_pins, ARRAY_SIZE(hp_jack_pins)); wm8350_hp_jack_detect(codec, WM8350_JDR, &hp_jack, SND_JACK_HEADPHONE); /* Microphone jack detection */ - snd_soc_jack_new(codec, "Microphone", - SND_JACK_MICROPHONE | SND_JACK_BTN_0, &mic_jack); - snd_soc_jack_add_pins(&mic_jack, ARRAY_SIZE(mic_jack_pins), - mic_jack_pins); + snd_soc_card_jack_new(rtd->card, "Microphone", + SND_JACK_MICROPHONE | SND_JACK_BTN_0, &mic_jack, + mic_jack_pins, ARRAY_SIZE(mic_jack_pins)); wm8350_mic_jack_detect(codec, &mic_jack, SND_JACK_MICROPHONE, SND_JACK_BTN_0); |