|
@@ -177,21 +177,19 @@ static int tegra_wm8903_init(struct snd_soc_pcm_runtime *rtd)
|
|
|
|
|
|
if (gpio_is_valid(machine->gpio_hp_det)) {
|
|
if (gpio_is_valid(machine->gpio_hp_det)) {
|
|
tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det;
|
|
tegra_wm8903_hp_jack_gpio.gpio = machine->gpio_hp_det;
|
|
- snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
|
|
|
|
- &tegra_wm8903_hp_jack);
|
|
|
|
- snd_soc_jack_add_pins(&tegra_wm8903_hp_jack,
|
|
|
|
- ARRAY_SIZE(tegra_wm8903_hp_jack_pins),
|
|
|
|
- tegra_wm8903_hp_jack_pins);
|
|
|
|
|
|
+ snd_soc_card_jack_new(rtd->card, "Headphone Jack",
|
|
|
|
+ SND_JACK_HEADPHONE, &tegra_wm8903_hp_jack,
|
|
|
|
+ tegra_wm8903_hp_jack_pins,
|
|
|
|
+ ARRAY_SIZE(tegra_wm8903_hp_jack_pins));
|
|
snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack,
|
|
snd_soc_jack_add_gpios(&tegra_wm8903_hp_jack,
|
|
1,
|
|
1,
|
|
&tegra_wm8903_hp_jack_gpio);
|
|
&tegra_wm8903_hp_jack_gpio);
|
|
}
|
|
}
|
|
|
|
|
|
- snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
|
|
|
|
- &tegra_wm8903_mic_jack);
|
|
|
|
- snd_soc_jack_add_pins(&tegra_wm8903_mic_jack,
|
|
|
|
- ARRAY_SIZE(tegra_wm8903_mic_jack_pins),
|
|
|
|
- tegra_wm8903_mic_jack_pins);
|
|
|
|
|
|
+ snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE,
|
|
|
|
+ &tegra_wm8903_mic_jack,
|
|
|
|
+ tegra_wm8903_mic_jack_pins,
|
|
|
|
+ ARRAY_SIZE(tegra_wm8903_mic_jack_pins));
|
|
wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
|
|
wm8903_mic_detect(codec, &tegra_wm8903_mic_jack, SND_JACK_MICROPHONE,
|
|
0);
|
|
0);
|
|
|
|
|