Merge branch 'asoc-5.5' into asoc-next

Mark Brown committed 6 years ago

Commit 8c4d2a02 parents 3701d2c 39870b0228 files · +12218 −3530Browse files

Showing the changes to include/uapi (3 of 228 files). Show all

Unified · Split

3 files

 	__s32 reserved[15];	/* Can be used for SND_AUDIOCODEC_BESPOKE */
 } __attribute__((packed, aligned(4)));
+struct snd_dec_flac {
+	__u16 sample_size;
+	__u16 min_blk_size;
+	__u16 max_blk_size;
+	__u16 min_frame_size;
+	__u16 max_frame_size;
+	__u16 reserved;
+} __attribute__((packed, aligned(4)));
 union snd_codec_options {
 	struct snd_enc_wma wma;
 	struct snd_enc_vorbis vorbis;
 	struct snd_enc_real real;
 	struct snd_enc_flac flac;
 	struct snd_enc_generic generic;
+	struct snd_dec_flac flac_d;
 } __attribute__((packed, aligned(4)));
 /** struct snd_codec_desc - description of codec capabilities

@@ -26,7 +26,7 @@ · 25 unmodified lines
26		26
27	/* SOF ABI version major, minor and patch numbers */	27	/* SOF ABI version major, minor and patch numbers */
28	#define SOF_ABI_MAJOR 3	28	#define SOF_ABI_MAJOR 3
29	#define SOF_ABI_MINOR 10	29	#define SOF_ABI_MINOR 11
30	#define SOF_ABI_PATCH 0	30	#define SOF_ABI_PATCH 0
31		31
32	/* SOF ABI version number. Format within 32bit word is MMmmmppp */	32	/* SOF ABI version number. Format within 32bit word is MMmmmppp */

@@ -111,7 +111,14 @@ · 110 unmodified lines
111	/* TODO: Add SAI tokens */	111	/* TODO: Add SAI tokens */
112		112
113	/* ESAI */	113	/* ESAI */
114	#define SOF_TKN_IMX_ESAI_FIRST_TOKEN 1100	114	#define SOF_TKN_IMX_ESAI_MCLK_ID 1100
115	/* TODO: Add ESAI tokens */	115
		116	/* Stream */
		117	#define SOF_TKN_STREAM_PLAYBACK_COMPATIBLE_D0I3 1200
		118	#define SOF_TKN_STREAM_CAPTURE_COMPATIBLE_D0I3 1201
		119
		120	/* Led control for mute switches */
		121	#define SOF_TKN_MUTE_LED_USE 1300
		122	#define SOF_TKN_MUTE_LED_DIRECTION 1301
116		123
117	#endif	124	#endif

Keyboard shortcuts