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

Commit 6734be9a authored by Linux Build Service Account's avatar Linux Build Service Account Committed by Gerrit - the friendly Code Review server
Browse files

Merge "i2c/spi: Modify GSI API calls to account for new parameters"

parents 27e14ecb 652dd88d

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

+7 −5
Original line number Diff line number Diff line
@@ -459,7 +459,7 @@ static int geni_i2c_gsi_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 
		cfg0->dword[1] = MSM_GPI_I2C_CONFIG0_TRE_DWORD1(0, 0);

		cfg0->dword[2] = MSM_GPI_I2C_CONFIG0_TRE_DWORD2(0,

								itr->clk_div);

		cfg0->dword[3] = MSM_GPI_I2C_CONFIG0_TRE_DWORD3(0, 0, 0, 1);

		cfg0->dword[3] = MSM_GPI_I2C_CONFIG0_TRE_DWORD3(0, 0, 0, 0, 1);



		gi2c->tx_cb.userdata = gi2c;

		gi2c->rx_cb.userdata = gi2c;
@@ -493,10 +493,12 @@ 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);

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

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

									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, 1);

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

									1);

		}



		sg_set_buf(&gi2c->tx_sg[index++], &gi2c->go_t,
@@ -513,7 +515,7 @@ static int geni_i2c_gsi_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 
			gi2c->rx_t.dword[2] =

				MSM_GPI_DMA_W_BUFFER_TRE_DWORD2(msgs[i].len);

			gi2c->rx_t.dword[3] =

				MSM_GPI_DMA_W_BUFFER_TRE_DWORD3(0, 1, 0, 0);

				MSM_GPI_DMA_W_BUFFER_TRE_DWORD3(0, 0, 1, 0, 0);



			sg_set_buf(&gi2c->rx_sg, &gi2c->rx_t,

						 sizeof(gi2c->rx_t));
@@ -544,7 +546,7 @@ static int geni_i2c_gsi_xfer(struct i2c_adapter *adap, struct i2c_msg msgs[], 
			gi2c->tx_t.dword[2] =

				MSM_GPI_DMA_W_BUFFER_TRE_DWORD2(msgs[i].len);

			gi2c->tx_t.dword[3] =

				MSM_GPI_DMA_W_BUFFER_TRE_DWORD3(0, 1, 0, 0);

				MSM_GPI_DMA_W_BUFFER_TRE_DWORD3(0, 0, 1, 0, 0);



			sg_set_buf(&gi2c->tx_sg[index++], &gi2c->tx_t,

							  sizeof(gi2c->tx_t));

drivers/spi/spi-geni-qcom.c

+3 −3
Original line number Diff line number Diff line
@@ -371,7 +371,7 @@ static struct msm_gpi_tre *setup_config0_tre(struct spi_transfer *xfer, 
	c0_tre->dword[1] = MSM_GPI_SPI_CONFIG0_TRE_DWORD1(0, cs_clk_delay,

							inter_words_delay);

	c0_tre->dword[2] = MSM_GPI_SPI_CONFIG0_TRE_DWORD2(idx, div);

	c0_tre->dword[3] = MSM_GPI_SPI_CONFIG0_TRE_DWORD3(0, 0, 0, 1);

	c0_tre->dword[3] = MSM_GPI_SPI_CONFIG0_TRE_DWORD3(0, 0, 0, 0, 1);

	GENI_SE_DBG(mas->ipc, false, mas->dev,

		"%s: flags 0x%x word %d pack %d idx %d div %d\n",

		__func__, flags, word_len, pack, idx, div);
@@ -404,7 +404,7 @@ static struct msm_gpi_tre *setup_go_tre(int cmd, int cs, int rx_len, int flags, 
		chain = 1;

		eob = 0;

	}

	go_tre->dword[3] = MSM_GPI_SPI_GO_TRE_DWORD3(0, eot, eob, chain);

	go_tre->dword[3] = MSM_GPI_SPI_GO_TRE_DWORD3(0, 0, eot, eob, chain);

	GENI_SE_DBG(mas->ipc, false, mas->dev,

		"%s: rx len %d flags 0x%x cs %d cmd %d eot %d eob %d chain %d\n",

		__func__, rx_len, flags, cs, cmd, eot, eob, chain);
@@ -422,7 +422,7 @@ static struct msm_gpi_tre *setup_dma_tre(struct msm_gpi_tre *tre, 
	tre->dword[0] = MSM_GPI_DMA_W_BUFFER_TRE_DWORD0(buf);

	tre->dword[1] = MSM_GPI_DMA_W_BUFFER_TRE_DWORD1(buf);

	tre->dword[2] = MSM_GPI_DMA_W_BUFFER_TRE_DWORD2(len);

	tre->dword[3] = MSM_GPI_DMA_W_BUFFER_TRE_DWORD3(0, is_tx, 0, 0);

	tre->dword[3] = MSM_GPI_DMA_W_BUFFER_TRE_DWORD3(0, 0, is_tx, 0, 0);

	return tre;

}