Commit 1ce71394 authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'topic/ro_wordlength' into next

parents b468a785 a9107de4

drivers/soundwire/stream.c

+9 −7
Original line number Diff line number Diff line
@@ -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

+2 −0
Original line number Diff line number Diff line
@@ -299,6 +299,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

 */
@@ -322,6 +323,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;

};