diff options
| author | Takashi Iwai <tiwai@suse.de> | 2023-05-16 20:11:50 +0200 |
|---|---|---|
| committer | Takashi Iwai <tiwai@suse.de> | 2023-05-16 20:11:50 +0200 |
| commit | cc638dba23266897c80b9bc87f33de44565fab38 (patch) | |
| tree | 139d73c3d24e11296ef5c117524f337d41657697 /include/uapi | |
| parent | 9dc68a4fe70893b000fb3c92c68b9f72369cf448 (diff) | |
| parent | 9be0b3a0074a61df1c94c37faea35ec8b9ea130b (diff) | |
| download | linux-cc638dba23266897c80b9bc87f33de44565fab38.tar.gz linux-cc638dba23266897c80b9bc87f33de44565fab38.tar.bz2 linux-cc638dba23266897c80b9bc87f33de44565fab38.zip | |
Merge tag 'asoc-fix-v6.4-rc2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus
ASoC: Fixes for v6.4
More fixes that came in since the merge window, the bulk of which are
for the SOF code, I suspect as a result of the wide usage, active
development and large code size rather than huge quality problems.
There's also a couple of MAINTAINERS updates and some new device quirks.
Diffstat (limited to 'include/uapi')
| -rw-r--r-- | include/uapi/sound/sof/tokens.h | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/include/uapi/sound/sof/tokens.h b/include/uapi/sound/sof/tokens.h index bbc37877aaff..e9ec7e4eb982 100644 --- a/include/uapi/sound/sof/tokens.h +++ b/include/uapi/sound/sof/tokens.h @@ -183,7 +183,7 @@ #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_INTERLEAVING_STYLE 1906 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_FMT_CFG 1907 #define SOF_TKN_CAVS_AUDIO_FORMAT_IN_SAMPLE_TYPE 1908 -#define SOF_TKN_CAVS_AUDIO_FORMAT_PIN_INDEX 1909 +#define SOF_TKN_CAVS_AUDIO_FORMAT_INPUT_PIN_INDEX 1909 /* intentional token numbering discontinuity, reserved for future use */ #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_RATE 1930 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_BIT_DEPTH 1931 @@ -194,6 +194,7 @@ #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_INTERLEAVING_STYLE 1936 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_FMT_CFG 1937 #define SOF_TKN_CAVS_AUDIO_FORMAT_OUT_SAMPLE_TYPE 1938 +#define SOF_TKN_CAVS_AUDIO_FORMAT_OUTPUT_PIN_INDEX 1939 /* intentional token numbering discontinuity, reserved for future use */ #define SOF_TKN_CAVS_AUDIO_FORMAT_IBS 1970 #define SOF_TKN_CAVS_AUDIO_FORMAT_OBS 1971 |