summaryrefslogtreecommitdiff
path: root/include
diff options
context:
space:
mode:
authorTakashi Iwai <tiwai@suse.de>2022-11-23 19:14:10 +0300
committerTakashi Iwai <tiwai@suse.de>2022-11-23 19:14:10 +0300
commitecae4c8954a1faba6fcc4fe6ec1680b3c4e393d1 (patch)
tree58c69aca717eb789d235f40bfb89f1b50c0f78c6 /include
parent05530ef7cf7c7d700f6753f058999b1b5099a026 (diff)
parentdb8f91d424fe0ea6db337aca8bc05908bbce1498 (diff)
downloadlinux-ecae4c8954a1faba6fcc4fe6ec1680b3c4e393d1.tar.xz
Merge tag 'asoc-fix-v6.1-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.1 A clutch of small fixes that have come in in the past week, people seem to have been unusually active for this late in the release cycle. The most critical one here is the fix to renumber the SOF DAI types in order to restore ABI compatibility which was broken by the addition of AMD support.
Diffstat (limited to 'include')
-rw-r--r--include/sound/sof/dai.h2
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 */