Merge "soc: swr-mstr: Fix port collision during wsa playback" (1e509a5e) · Commits · e / devices / android_kernel_fairphone_FP4

soc/swr-mstr-ctrl.c

+6 −3

Original line number	Diff line number	Diff line
		@@ -843,7 +843,8 @@ static void swrm_copy_data_port_config(struct swr_master *master, u8 bank)
		port_req->dev_num, 0x00,
		SWRS_DP_BLOCK_CONTROL_1(slv_id));
		}
		if (mport->blk_pack_mode != SWR_INVALID_PARAM) {
		if (mport->blk_pack_mode != SWR_INVALID_PARAM
		&& swrm->master_id != MASTER_ID_WSA) {
		reg[len] = SWRM_CMD_FIFO_WR_CMD;
		val[len++] =
		SWR_REG_VAL_PACK(mport->blk_pack_mode,
		@@ -871,6 +872,8 @@ static void swrm_copy_data_port_config(struct swr_master *master, u8 bank)
		}
		value = ((mport->req_ch)
		<< SWRM_DP_PORT_CTRL_EN_CHAN_SHFT);

		if (mport->offset2 != SWR_INVALID_PARAM)
		value \|= ((mport->offset2)
		<< SWRM_DP_PORT_CTRL_OFFSET2_SHFT);
		value \|= ((mport->offset1)

+2 −2

Original line number	Diff line number	Diff line
		@@ -24,10 +24,10 @@
		struct port_params wsa_frame_superset[SWR_MSTR_PORT_LEN] = {
		{7, 1, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		{31, 2, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		{63, 12, 31, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		{63, 12, 31, 0xFF, 0xFF, 0xFF, 0x1, 0xFF, 0xFF},
		{7, 6, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		{31, 18, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		{63, 13, 31, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		{63, 13, 31, 0xFF, 0xFF, 0xFF, 0x1, 0xFF, 0xFF},
		{15, 7, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		{15, 10, 0, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF, 0xFF},
		};