diff options
| author | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-25 09:26:18 -0800 |
|---|---|---|
| committer | Linus Torvalds <torvalds@linux-foundation.org> | 2022-11-25 09:26:18 -0800 |
| commit | ca66e58001ad9418e937ceb56bce8b1fe183c62e (patch) | |
| tree | 6a177d2264f8390da8aa2408aaafc7358f82ae05 /include | |
| parent | 6fe0e074e76985c7be3eaa7a8fd51401a8999cae (diff) | |
| parent | ecae4c8954a1faba6fcc4fe6ec1680b3c4e393d1 (diff) | |
| download | linux-stable-ca66e58001ad9418e937ceb56bce8b1fe183c62e.tar.gz linux-stable-ca66e58001ad9418e937ceb56bce8b1fe183c62e.tar.bz2 linux-stable-ca66e58001ad9418e937ceb56bce8b1fe183c62e.zip | |
Merge tag 'sound-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound
Pull sound fixes from Takashi Iwai:
"A few more last-minute fixes for 6.1 that have been gathered in the
last week; nothing looks too worrisome, mostly device-specific small
fixes, including the ABI fix for ASoC SOF"
* tag 'sound-6.1-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound:
ASoC: soc-pcm: Add NULL check in BE reparenting
ALSA: seq: Fix function prototype mismatch in snd_seq_expand_var_event
ASoC: SOF: dai: move AMD_HS to end of list to restore backwards-compatibility
ASoC: max98373: Add checks for devm_kcalloc
ASoC: rt711-sdca: fix the latency time of clock stop prepare state machine transitions
ASoC: soc-pcm: Don't zero TDM masks in __soc_pcm_open()
ASoC: sgtl5000: Reset the CHIP_CLK_CTRL reg on remove
ASoC: hdac_hda: fix hda pcm buffer overflow issue
ASoC: stm32: i2s: remove irqf_oneshot flag
ASoC: wm8962: Wait for updated value of WM8962_CLOCKING1 register
Diffstat (limited to 'include')
| -rw-r--r-- | include/sound/sof/dai.h | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/include/sound/sof/dai.h b/include/sound/sof/dai.h index 83fd81c82e4c..9fbd3832bcdc 100644 --- a/include/sound/sof/dai.h +++ b/include/sound/sof/dai.h @@ -84,8 +84,8 @@ enum sof_ipc_dai_type { SOF_DAI_AMD_BT, /**< AMD ACP BT*/ SOF_DAI_AMD_SP, /**< AMD ACP SP */ SOF_DAI_AMD_DMIC, /**< AMD ACP DMIC */ - SOF_DAI_AMD_HS, /**< Amd HS */ SOF_DAI_MEDIATEK_AFE, /**< Mediatek AFE */ + SOF_DAI_AMD_HS, /**< Amd HS */ }; /* general purpose DAI configuration */ |