mirror of
https://git.kernel.org/pub/scm/linux/kernel/git/stable/linux.git
synced 2024-08-21 16:29:59 +00:00
ASoC: tegra_rt5640: Register jacks at the card level
The jacks are card level elements so use snd_soc_card_jack_new() instead of snd_soc_jack_new() to register them. Signed-off-by: Lars-Peter Clausen <lars@metafoo.de> Signed-off-by: Mark Brown <broonie@kernel.org>
This commit is contained in:
parent
d020e77c61
commit
00eafe3b1b
1 changed files with 3 additions and 7 deletions
|
@ -108,15 +108,11 @@ static const struct snd_kcontrol_new tegra_rt5640_controls[] = {
|
|||
|
||||
static int tegra_rt5640_asoc_init(struct snd_soc_pcm_runtime *rtd)
|
||||
{
|
||||
struct snd_soc_dai *codec_dai = rtd->codec_dai;
|
||||
struct snd_soc_codec *codec = codec_dai->codec;
|
||||
struct tegra_rt5640 *machine = snd_soc_card_get_drvdata(rtd->card);
|
||||
|
||||
snd_soc_jack_new(codec, "Headphones", SND_JACK_HEADPHONE,
|
||||
&tegra_rt5640_hp_jack);
|
||||
snd_soc_jack_add_pins(&tegra_rt5640_hp_jack,
|
||||
ARRAY_SIZE(tegra_rt5640_hp_jack_pins),
|
||||
tegra_rt5640_hp_jack_pins);
|
||||
snd_soc_card_jack_new(rtd->card, "Headphones", SND_JACK_HEADPHONE,
|
||||
&tegra_rt5640_hp_jack, tegra_rt5640_hp_jack_pins,
|
||||
ARRAY_SIZE(tegra_rt5640_hp_jack_pins));
|
||||
|
||||
if (gpio_is_valid(machine->gpio_hp_det)) {
|
||||
tegra_rt5640_hp_jack_gpio.gpio = machine->gpio_hp_det;
|
||||
|
|
Loading…
Reference in a new issue