Commit ca1c131c authored by Vinod Koul's avatar Vinod Koul
Browse files

Merge branch 'fixes' into next 

Merge fixes into next as Intel driver has a dependency
parents febc50b8 49a46731

drivers/soundwire/intel.c

+1 −0
Original line number Diff line number Diff line
@@ -1512,6 +1512,7 @@ static int intel_link_probe(struct auxiliary_device *auxdev, 


	bus->link_id = auxdev->id;

	bus->dev_num_ida_min = INTEL_DEV_NUM_IDA_MIN;

	bus->clk_stop_timeout = 1;



	sdw_cdns_probe(cdns);

drivers/soundwire/qcom.c

+9 −0
Original line number Diff line number Diff line
@@ -345,6 +345,9 @@ static int qcom_swrm_cmd_fifo_wr_cmd(struct qcom_swrm_ctrl *swrm, u8 cmd_data, 
	if (swrm_wait_for_wr_fifo_avail(swrm))

		return SDW_CMD_FAIL_OTHER;



	if (cmd_id == SWR_BROADCAST_CMD_ID)

		reinit_completion(&swrm->broadcast);



	/* Its assumed that write is okay as we do not get any status back */

	swrm->reg_write(swrm, SWRM_CMD_FIFO_WR_CMD, val);
@@ -378,6 +381,12 @@ static int qcom_swrm_cmd_fifo_rd_cmd(struct qcom_swrm_ctrl *swrm, 


	val = swrm_get_packed_reg_val(&swrm->rcmd_id, len, dev_addr, reg_addr);



	/*

	 * Check for outstanding cmd wrt. write fifo depth to avoid

	 * overflow as read will also increase write fifo cnt.

	 */

	swrm_wait_for_wr_fifo_avail(swrm);



	/* wait for FIFO RD to complete to avoid overflow */

	usleep_range(100, 105);

	swrm->reg_write(swrm, SWRM_CMD_FIFO_RD_CMD, val);