diff options
author | Takashi Iwai <tiwai@suse.de> | 2021-12-22 18:07:27 +0100 |
---|---|---|
committer | Takashi Iwai <tiwai@suse.de> | 2021-12-22 18:07:27 +0100 |
commit | 065807d758e20cd8e84aa043ffc094651b387978 (patch) | |
tree | 22cf35d5278e512be027cb1d752287d99590050e /sound/soc/tegra/tegra_asoc_machine.c | |
parent | ALSA: hda/realtek: fix mute/micmute LEDs for a HP ProBook (diff) | |
parent | ASoC: meson: aiu: Move AIU_I2S_MISC hold setting to aiu-fifo-i2s (diff) | |
download | linux-dev-065807d758e20cd8e84aa043ffc094651b387978.tar.xz linux-dev-065807d758e20cd8e84aa043ffc094651b387978.zip |
Merge tag 'asoc-fix-v5.16-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v5.16
This is a relatively large set of driver specific changes so it may make
sense to hold off to v5.17, though picking some over might be good.
It's a combination of new device IDs and fixes for various driver
specific things which are all small and of the usual "really bad if
you're running into them" level, especially the Tegra ones.
Diffstat (limited to 'sound/soc/tegra/tegra_asoc_machine.c')
-rw-r--r-- | sound/soc/tegra/tegra_asoc_machine.c | 11 |
1 files changed, 10 insertions, 1 deletions
diff --git a/sound/soc/tegra/tegra_asoc_machine.c b/sound/soc/tegra/tegra_asoc_machine.c index b95438c3dbf7..a73404879aa1 100644 --- a/sound/soc/tegra/tegra_asoc_machine.c +++ b/sound/soc/tegra/tegra_asoc_machine.c @@ -116,16 +116,24 @@ static const struct snd_kcontrol_new tegra_machine_controls[] = { SOC_DAPM_PIN_SWITCH("Headset Mic"), SOC_DAPM_PIN_SWITCH("Internal Mic 1"), SOC_DAPM_PIN_SWITCH("Internal Mic 2"), + SOC_DAPM_PIN_SWITCH("Headphones"), + SOC_DAPM_PIN_SWITCH("Mic Jack"), }; int tegra_asoc_machine_init(struct snd_soc_pcm_runtime *rtd) { struct snd_soc_card *card = rtd->card; struct tegra_machine *machine = snd_soc_card_get_drvdata(card); + const char *jack_name; int err; if (machine->gpiod_hp_det && machine->asoc->add_hp_jack) { - err = snd_soc_card_jack_new(card, "Headphones Jack", + if (machine->asoc->hp_jack_name) + jack_name = machine->asoc->hp_jack_name; + else + jack_name = "Headphones Jack"; + + err = snd_soc_card_jack_new(card, jack_name, SND_JACK_HEADPHONE, &tegra_machine_hp_jack, tegra_machine_hp_jack_pins, @@ -658,6 +666,7 @@ static struct snd_soc_card snd_soc_tegra_max98090 = { static const struct tegra_asoc_data tegra_max98090_data = { .mclk_rate = tegra_machine_mclk_rate_12mhz, .card = &snd_soc_tegra_max98090, + .hp_jack_name = "Headphones", .add_common_dapm_widgets = true, .add_common_controls = true, .add_common_snd_ops = true, |