diff options
| -rw-r--r-- | sound/soc/pxa/ttc-dkb.c | 15 |
1 files changed, 6 insertions, 9 deletions
diff --git a/sound/soc/pxa/ttc-dkb.c b/sound/soc/pxa/ttc-dkb.c index 5001dbb9b257..1753c7d9e760 100644 --- a/sound/soc/pxa/ttc-dkb.c +++ b/sound/soc/pxa/ttc-dkb.c | |||
| @@ -78,15 +78,12 @@ static int ttc_pm860x_init(struct snd_soc_pcm_runtime *rtd) | |||
| 78 | struct snd_soc_codec *codec = rtd->codec; | 78 | struct snd_soc_codec *codec = rtd->codec; |
| 79 | 79 | ||
| 80 | /* Headset jack detection */ | 80 | /* Headset jack detection */ |
| 81 | snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE | 81 | snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE | |
| 82 | | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2, | 82 | SND_JACK_BTN_0 | SND_JACK_BTN_1 | SND_JACK_BTN_2, |
| 83 | &hs_jack); | 83 | &hs_jack, hs_jack_pins, ARRAY_SIZE(hs_jack_pins)); |
| 84 | snd_soc_jack_add_pins(&hs_jack, ARRAY_SIZE(hs_jack_pins), | 84 | snd_soc_card_jack_new(rtd->card, "Microphone Jack", SND_JACK_MICROPHONE, |
| 85 | hs_jack_pins); | 85 | &mic_jack, mic_jack_pins, |
| 86 | snd_soc_jack_new(codec, "Microphone Jack", SND_JACK_MICROPHONE, | 86 | ARRAY_SIZE(mic_jack_pins)); |
| 87 | &mic_jack); | ||
| 88 | snd_soc_jack_add_pins(&mic_jack, ARRAY_SIZE(mic_jack_pins), | ||
| 89 | mic_jack_pins); | ||
| 90 | 87 | ||
| 91 | /* headphone, microphone detection & headset short detection */ | 88 | /* headphone, microphone detection & headset short detection */ |
| 92 | pm860x_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADPHONE, | 89 | pm860x_hs_jack_detect(codec, &hs_jack, SND_JACK_HEADPHONE, |