openkylin
/
linux
mirror of https://gitee.com/openkylin/linux.git
9
0
Fork 0
Code Issues Projects Releases Wiki Activity

Merge branch 'topic/ro_wordlength' into next

This commit is contained in:
Vinod Koul 2020-03-20 19:25:14 +05:30
parent b468a785bd a9107de4b0
commit 1ce7139436
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
drivers/soundwire/stream.c
View File

@ -167,13 +167,15 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,
return ret; return ret;
} }
/* Program DPN_BlockCtrl1 register */ if (!dpn_prop->read_only_wordlength) {
ret = sdw_write(s_rt->slave, addr2, (p_params->bps - 1)); /* Program DPN_BlockCtrl1 register */
if (ret < 0) { ret = sdw_write(s_rt->slave, addr2, (p_params->bps - 1));
dev_err(&s_rt->slave->dev, if (ret < 0) {
"DPN_BlockCtrl1 register write failed for port %d\n", dev_err(&s_rt->slave->dev,
t_params->port_num); "DPN_BlockCtrl1 register write failed for port %d\n",
return ret; t_params->port_num);
return ret;
}
} }
/* Program DPN_SampleCtrl1 register */ /* Program DPN_SampleCtrl1 register */

2
include/linux/soundwire/sdw.h
View File

@ -299,6 +299,7 @@ struct sdw_dpn_audio_mode {
* @max_async_buffer: Number of samples that this port can buffer in * @max_async_buffer: Number of samples that this port can buffer in
* asynchronous modes * asynchronous modes
* @block_pack_mode: Type of block port mode supported * @block_pack_mode: Type of block port mode supported
* @read_only_wordlength: Read Only wordlength field in DPN_BlockCtrl1 register
* @port_encoding: Payload Channel Sample encoding schemes supported * @port_encoding: Payload Channel Sample encoding schemes supported
* @audio_modes: Audio modes supported * @audio_modes: Audio modes supported
*/ */
@ -322,6 +323,7 @@ struct sdw_dpn_prop {
u32 modes; u32 modes;
u32 max_async_buffer; u32 max_async_buffer;
bool block_pack_mode; bool block_pack_mode;
bool read_only_wordlength;
u32 port_encoding; u32 port_encoding;
struct sdw_dpn_audio_mode *audio_modes; struct sdw_dpn_audio_mode *audio_modes;
}; };