History

Merge branch 'topic/ro_wordlength' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire into asoc-5.7

Mark Brown committed 6 years ago

Commit 4fcf4b12 parents b4a5675 a9107de2 files · +11 −7Browse files

Showing the changes to include/linux (1 of 2 files). Show all

Unified · Split

include/linux/soundwire/sdw.h+2−0
@@ -284,6 +284,7 @@ struct sdw_dpn_audio_mode { · 283 unmodified lines
284 * @max_async_buffer: Number of samples that this port can buffer in284 * @max_async_buffer: Number of samples that this port can buffer in
285 * asynchronous modes285 * asynchronous modes
286 * @block_pack_mode: Type of block port mode supported286 * @block_pack_mode: Type of block port mode supported
287 * @read_only_wordlength: Read Only wordlength field in DPN_BlockCtrl1 register
287 * @port_encoding: Payload Channel Sample encoding schemes supported288 * @port_encoding: Payload Channel Sample encoding schemes supported
288 * @audio_modes: Audio modes supported289 * @audio_modes: Audio modes supported
289 */290 */
@@ -307,6 +308,7 @@ struct sdw_dpn_prop { · 17 unmodified lines
307 u32 modes;308 u32 modes;
308 u32 max_async_buffer;309 u32 max_async_buffer;
309 bool block_pack_mode;310 bool block_pack_mode;
311 bool read_only_wordlength;
310 u32 port_encoding;312 u32 port_encoding;
311 struct sdw_dpn_audio_mode *audio_modes;313 struct sdw_dpn_audio_mode *audio_modes;
312};314};