summaryrefslogtreecommitdiff
path: root/sound/soc/tegra/tegra_rt5677.c
diff options
context:
space:
mode:
authorMark Brown <broonie@kernel.org>2015-04-08 23:09:54 +0300
committerMark Brown <broonie@kernel.org>2015-04-08 23:09:54 +0300
commitc77dc2c203908fe03582770b016ffc7c84242939 (patch)
treec85e844917bb40dbc9f9dc19cdc10af87f5624ea /sound/soc/tegra/tegra_rt5677.c
parent012baec5c1eaab7ad98b461eb7afae2faf79dbea (diff)
parent77c71765ef78f87dd901fcb4c751908e835a3b2e (diff)
downloadlinux-c77dc2c203908fe03582770b016ffc7c84242939.tar.xz
Merge branch 'topic/jack' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into asoc-tegra
Diffstat (limited to 'sound/soc/tegra/tegra_rt5677.c')
-rw-r--r--sound/soc/tegra/tegra_rt5677.c14
1 files changed, 6 insertions, 8 deletions
diff --git a/sound/soc/tegra/tegra_rt5677.c b/sound/soc/tegra/tegra_rt5677.c
index 4453566405ef..d082882547dd 100644
--- a/sound/soc/tegra/tegra_rt5677.c
+++ b/sound/soc/tegra/tegra_rt5677.c
@@ -146,10 +146,9 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
struct snd_soc_dapm_context *dapm = &codec->dapm;
struct tegra_rt5677 *machine = snd_soc_card_get_drvdata(rtd->card);
- snd_soc_jack_new(codec, "Headphone Jack", SND_JACK_HEADPHONE,
- &tegra_rt5677_hp_jack);
- snd_soc_jack_add_pins(&tegra_rt5677_hp_jack, 1,
- &tegra_rt5677_hp_jack_pins);
+ snd_soc_card_jack_new(rtd->card, "Headphone Jack", SND_JACK_HEADPHONE,
+ &tegra_rt5677_hp_jack,
+ &tegra_rt5677_hp_jack_pins, 1);
if (gpio_is_valid(machine->gpio_hp_det)) {
tegra_rt5677_hp_jack_gpio.gpio = machine->gpio_hp_det;
@@ -158,10 +157,9 @@ static int tegra_rt5677_asoc_init(struct snd_soc_pcm_runtime *rtd)
}
- snd_soc_jack_new(codec, "Mic Jack", SND_JACK_MICROPHONE,
- &tegra_rt5677_mic_jack);
- snd_soc_jack_add_pins(&tegra_rt5677_mic_jack, 1,
- &tegra_rt5677_mic_jack_pins);
+ snd_soc_card_jack_new(rtd->card, "Mic Jack", SND_JACK_MICROPHONE,
+ &tegra_rt5677_mic_jack,
+ &tegra_rt5677_mic_jack_pins, 1);
if (gpio_is_valid(machine->gpio_mic_present)) {
tegra_rt5677_mic_jack_gpio.gpio = machine->gpio_mic_present;