Merge branch 'topic/ro_wordlength' of...

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

drivers/soundwire/stream.c

@@ -167,6 +167,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,
 		return ret;
 	}
 
+	if (!dpn_prop->read_only_wordlength) {
 		/* Program DPN_BlockCtrl1 register */
 		ret = sdw_write(s_rt->slave, addr2, (p_params->bps - 1));
 		if (ret < 0) {
@@ -175,6 +176,7 @@ static int sdw_program_slave_port_params(struct sdw_bus *bus,
 				t_params->port_num);
 			return ret;
 		}
+	}
 
 	/* Program DPN_SampleCtrl1 register */
 	wbuf = (t_params->sample_interval - 1) & SDW_DPN_SAMPLECTRL_LOW;

include/linux/soundwire/sdw.h

@@ -284,6 +284,7 @@ struct sdw_dpn_audio_mode {
  * @max_async_buffer: Number of samples that this port can buffer in
  * asynchronous modes
  * @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
  * @audio_modes: Audio modes supported
  */
@@ -307,6 +308,7 @@ struct sdw_dpn_prop {
 	u32 modes;
 	u32 max_async_buffer;
 	bool block_pack_mode;
+	bool read_only_wordlength;
 	u32 port_encoding;
 	struct sdw_dpn_audio_mode *audio_modes;
 };