diff options
| author | Takashi Iwai <tiwai@suse.de> | 2022-05-23 16:03:04 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2022-05-23 16:03:04 +0200 |
| commit | 0163717ed5dec4fc3aaf937baa9f66f21ca11c1d (patch) | |
| tree | b0618a944385d1d35bd829c9aa09eddb5c9633fa /sound/soc/intel/boards/bxt_rt298.c | |
| parent | 1693e265e0a5dbe11fba21b48272dd15dbb71ec0 (diff) | |
| parent | e5cd20e0d6713138444cc3f3f982712cf9a36143 (diff) | |
| download | linux-0163717ed5dec4fc3aaf937baa9f66f21ca11c1d.tar.gz linux-0163717ed5dec4fc3aaf937baa9f66f21ca11c1d.tar.bz2 linux-0163717ed5dec4fc3aaf937baa9f66f21ca11c1d.zip | |
Merge tag 'asoc-v5.19' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Updates for v5.19
This is quite a big update, partly due to the addition of some larger
drivers (more of which is to follow since at least the AVS driver is
still a work in progress) and partly due to Charles' work sorting out
our handling of endianness. As has been the case recently it's much
more about drivers than the core.
- Overhaul of endianness specification for data formats, avoiding
needless restrictions due to CODECs.
- Initial stages of Intel AVS driver merge.
- Introduction of v4 IPC mechanism for SOF.
- TDM mode support for AK4613.
- Support for Analog Devices ADAU1361, Cirrus Logic CS35L45, Maxim
MAX98396, MediaTek MT8186, NXP i.MX8 micfil and SAI interfaces,
nVidia Tegra186 ASRC, and Texas Instruments TAS2764 and TAS2780
Diffstat (limited to 'sound/soc/intel/boards/bxt_rt298.c')
| -rw-r--r-- | sound/soc/intel/boards/bxt_rt298.c | 5 |
1 files changed, 2 insertions, 3 deletions
diff --git a/sound/soc/intel/boards/bxt_rt298.c b/sound/soc/intel/boards/bxt_rt298.c index 05e833076499..75995d17597d 100644 --- a/sound/soc/intel/boards/bxt_rt298.c +++ b/sound/soc/intel/boards/bxt_rt298.c @@ -168,7 +168,7 @@ static int broxton_rt298_codec_init(struct snd_soc_pcm_runtime *rtd) struct snd_soc_component *component = asoc_rtd_to_codec(rtd, 0)->component; int ret = 0; - ret = snd_soc_card_jack_new(rtd->card, "Headset", + ret = snd_soc_card_jack_new_pins(rtd->card, "Headset", SND_JACK_HEADSET | SND_JACK_BTN_0, &broxton_headset, broxton_headset_pins, ARRAY_SIZE(broxton_headset_pins)); @@ -544,8 +544,7 @@ static int bxt_card_late_probe(struct snd_soc_card *card) snprintf(jack_name, sizeof(jack_name), "HDMI/DP, pcm=%d Jack", pcm->device); err = snd_soc_card_jack_new(card, jack_name, - SND_JACK_AVOUT, &broxton_hdmi[i], - NULL, 0); + SND_JACK_AVOUT, &broxton_hdmi[i]); if (err) return err; |