History

Merge branch 'asoc-5.4' into asoc-next

Mark Brown committed 7 years ago

Commit bb831782 parents 6652ddb 6fa5963272 files · +12110 −6853Browse files

Showing the changes to include/uapi/sound (2 of 272 files). Show all

Unified · Split

2 files
  1. include/uapi/sound/sof/abi.h +1 −1
  2. include/uapi/sound/sof/tokens.h +9 −0
include/uapi/sound/sof/abi.h+1−1
@@ -26,7 +26,7 @@ · 25 unmodified lines
2626
2727 /* SOF ABI version major, minor and patch numbers */
2828 #define SOF_ABI_MAJOR 3
29−#define SOF_ABI_MINOR 8
29+#define SOF_ABI_MINOR 10
3030 #define SOF_ABI_PATCH 0
3131
3232 /* SOF ABI version number. Format within 32bit word is MMmmmppp */
include/uapi/sound/sof/tokens.h+9−0
@@ -75,6 +75,7 @@ · 74 unmodified lines
7575 #define SOF_TKN_INTEL_SSP_FRAME_PULSE_WIDTH 503
7676 #define SOF_TKN_INTEL_SSP_QUIRKS 504
7777 #define SOF_TKN_INTEL_SSP_TDM_PADDING_PER_SLOT 505
78+#define SOF_TKN_INTEL_SSP_BCLK_DELAY 506
7879
7980 /* DMIC */
8081 #define SOF_TKN_INTEL_DMIC_DRIVER_VERSION 600
@@ -105,4 +106,12 @@ · 24 unmodified lines
105106 /* for backward compatibility */
106107 #define SOF_TKN_EFFECT_TYPE SOF_TKN_PROCESS_TYPE
107108
109+/* SAI */
110+#define SOF_TKN_IMX_SAI_FIRST_TOKEN 1000
111+/* TODO: Add SAI tokens */
112+
113+/* ESAI */
114+#define SOF_TKN_IMX_ESAI_FIRST_TOKEN 1100
115+/* TODO: Add ESAI tokens */
116+
108117 #endif