Donate to e Foundation | Murena handsets with /e/OS | Own a part of Murena! Learn more

Commit d02483f8 authored by qctecmdr's avatar qctecmdr Committed by Gerrit - the friendly Code Review server
Browse files

Merge "Revert "i2c: i2c-qcom-geni: Set IEOB for Go tre in a Read transfer""

parents 83429f9f 3b01c7ee

drivers/dma/qcom/gpi.c

+1 −1
Original line number Diff line number Diff line
@@ -2363,7 +2363,7 @@ struct dma_async_tx_descriptor *gpi_prep_slave_sg(struct dma_chan *chan, 
		tre = sg_virt(sg);



		/* Check if last tre has ieob set */

		if (sg_len != 1 && i == sg_len - 1) {

		if (i == sg_len - 1) {

			if ((((struct msm_gpi_tre *)tre)->dword[3] &

					GPI_IEOB_BMSK) >> GPI_IEOB_BMSK_SHIFT)

				gpii->ieob_set = true;

drivers/i2c/busses/i2c-qcom-geni.c

+3 −7
Original line number Diff line number Diff line
@@ -405,7 +405,7 @@ static void gi2c_gsi_tx_cb(void *ptr) 
	struct msm_gpi_dma_async_tx_cb_param *tx_cb = ptr;

	struct geni_i2c_dev *gi2c = tx_cb->userdata;



	if (tx_cb->completion_code == MSM_GPI_TCE_EOB && gi2c->is_shared) {

	if (tx_cb->completion_code == MSM_GPI_TCE_EOB) {

		complete(&gi2c->xfer);

	} else if (!(gi2c->cur->flags & I2C_M_RD)) {

		gi2c_gsi_cb_err(tx_cb, "TX");
@@ -553,12 +553,8 @@ static int geni_i2c_gsi_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 


		if (msgs[i].flags & I2C_M_RD) {

			go_t->dword[2] = MSM_GPI_I2C_GO_TRE_DWORD2(msgs[i].len);

			if (gi2c->is_shared)

				go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(1,

							0, 0, 0, 0);

			else

				go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(1,

							0, 0, 1, 0);

			go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(1, 0, 0, 0,

									0);

		} else {

			go_t->dword[2] = MSM_GPI_I2C_GO_TRE_DWORD2(0);

			go_t->dword[3] = MSM_GPI_I2C_GO_TRE_DWORD3(0, 0, 0, 0,