diff options
Diffstat (limited to 'sound/soc/tegra/tegra_wm8903.c')
| -rw-r--r-- | sound/soc/tegra/tegra_wm8903.c | 18 |
1 files changed, 8 insertions, 10 deletions
diff --git a/sound/soc/tegra/tegra_wm8903.c b/sound/soc/tegra/tegra_wm8903.c index e52420dae2b4..4a95b70f0cf0 100644 --- a/sound/soc/tegra/tegra_wm8903.c +++ b/sound/soc/tegra/tegra_wm8903.c | |||
| @@ -177,21 +177,19 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd) | |||
| 177 | 177 | ||
| 178 | if (gpio_is_valid(machine->gpio_hp_det)) { | 178 | if (gpio_is_valid(machine->gpio_hp_det)) { |
| 179 | tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det; | 179 | tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det; |
| 180 | snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE, | 180 | snd_soc_card_jack_new(rtd->card, "Headphone Jack", |
| 181 | &tegra_wm8903_hp_jack); | 181 | SND_JACK_HEADPHONE, &tegra_wm8903_hp_jack, |
| 182 | snd_soc_jack_add_pins(&tegra_wm8903_hp_jack, | 182 | tegra_wm8903_hp_jack_pins, |
| 183 | ARRAY_SIZE(tegra_wm8903_hp_jack_pins), | 183 | ARRAY_SIZE(tegra_wm8903_hp_jack_pins)); |
| 184 | tegra_wm8903_hp_jack_pins); | ||
| 185 | snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack, | 184 | snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack, |
| 186 | 1, | 185 | 1, |
| 187 | &tegra_wm8903_hp_jack_gpio); | 186 | &tegra_wm8903_hp_jack_gpio); |
| 188 | } | 187 | } |
| 189 | 188 | ||
| 190 | snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE, | 189 | snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE, |
| 191 | &tegra_wm8903_mic_jack); | 190 | &tegra_wm8903_mic_jack, |
| 192 | snd_soc_jack_add_pins(&tegra_wm8903_mic_jack, | 191 | tegra_wm8903_mic_jack_pins, |
| 193 | ARRAY_SIZE(tegra_wm8903_mic_jack_pins), | 192 | ARRAY_SIZE(tegra_wm8903_mic_jack_pins)); |
| 194 | tegra_wm8903_mic_jack_pins); | ||
| 195 | wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE, | 193 | wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE, |
| 196 | 0); | 194 | 0); |
| 197 | 195 | ||
