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

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

Merge "dt-bindings: spi: Allow flexible MISO sampling rate for SPI HLOS"

parents b8a79f44 f94af1ba

Documentation/devicetree/bindings/spi/qcom,spi-geni-qcom.txt

+2 −0
Original line number Diff line number Diff line
@@ -29,6 +29,8 @@ Optional properties: 
- qcom,rt:	Specifies if the framework worker thread for this

		controller device should have "real-time" priority.

- qcom,disable-autosuspend: Specifies to disable runtime PM auto suspend.

- qcom,set-miso-sampling: Specifies to set miso sampling rate.

- qcom,miso-sampling-ctrl-val: Specifies the value of miso sampling rate.



SPI slave nodes must be children of the SPI master node and can contain

the following properties.

drivers/spi/spi-geni-qcom.c

+71 −0
Original line number Diff line number Diff line
@@ -108,6 +108,16 @@ 
				M_RX_FIFO_RD_ERR_EN | M_RX_FIFO_WR_ERR_EN | \

				M_TX_FIFO_RD_ERR_EN | M_TX_FIFO_WR_ERR_EN)



/* SPI sampling registers */

#define SE_GENI_CGC_CTRL	(0x28)

#define SE_GENI_CFG_SEQ_START	(0x84)

#define SE_GENI_CFG_REG108	(0x2B0)

#define SE_GENI_CFG_REG109	(0x2B4)

#define CPOL_CTRL_SHFT	1

#define RX_IO_POS_FF_EN_SEL_SHFT	4

#define RX_IO_EN2CORE_EN_DELAY_SHFT	8

#define RX_SI_EN2IO_DELAY_SHFT 12



struct gsi_desc_cb {

	struct spi_master *spi;

	struct spi_transfer *xfer;
@@ -175,6 +185,8 @@ struct spi_geni_master { 
	bool dis_autosuspend;

	bool cmd_done;

	struct spi_geni_ssr spi_ssr;

	bool set_miso_sampling;

	u32 miso_sampling_ctrl_val;

};



static void spi_slv_setup(struct spi_geni_master *mas);
@@ -862,6 +874,7 @@ static int spi_geni_prepare_transfer_hardware(struct spi_master *spi) 
	int ret = 0, count = 0, proto;

	u32 max_speed = spi->cur_msg->spi->max_speed_hz;

	struct se_geni_rsc *rsc = &mas->spi_rsc;

	u32 cpol, cpha, cfg_reg108, cfg_reg109, cfg_seq_start;



	mutex_lock(&mas->spi_ssr.ssr_lock);

	if (mas->spi_ssr.is_ssr_down) {
@@ -1020,6 +1033,54 @@ static int spi_geni_prepare_transfer_hardware(struct spi_master *spi) 
				"%s:Major:%d Minor:%d step:%dos%d\n",

			__func__, major, minor, step, mas->oversampling);

		}



		if (!mas->set_miso_sampling)

			goto shared_se;



		cpol = geni_read_reg(mas->base, SE_SPI_CPOL);

		cpha = geni_read_reg(mas->base, SE_SPI_CPHA);

		cfg_reg108 = geni_read_reg(mas->base, SE_GENI_CFG_REG108);

		cfg_reg109 = geni_read_reg(mas->base, SE_GENI_CFG_REG109);

		/* clear CPOL bit */

		cfg_reg108 &= ~(1 << CPOL_CTRL_SHFT);



		if (major == 1 && minor == 0) {

			/* Write 1 to RX_SI_EN2IO_DELAY reg */

			cfg_reg108 &= ~(0x7 << RX_SI_EN2IO_DELAY_SHFT);

			cfg_reg108 |= (1 << RX_SI_EN2IO_DELAY_SHFT);

			/* Write 0 to RX_IO_POS_FF_EN_SEL reg */

			cfg_reg108 &= ~(1 << RX_IO_POS_FF_EN_SEL_SHFT);

		} else if ((major < 2) || (major == 2 && minor < 5)) {

			/* Write 0 to RX_IO_EN2CORE_EN_DELAY reg */

			cfg_reg108 &= ~(0x7 << RX_IO_EN2CORE_EN_DELAY_SHFT);

		} else {

			/*

			 * Write miso_sampling_ctrl_set to

			 * RX_IO_EN2CORE_EN_DELAY reg

			 */

			cfg_reg108 &= ~(0x7 << RX_IO_EN2CORE_EN_DELAY_SHFT);

			cfg_reg108 |= (mas->miso_sampling_ctrl_val <<

					RX_IO_EN2CORE_EN_DELAY_SHFT);

		}



		geni_write_reg(cfg_reg108, mas->base, SE_GENI_CFG_REG108);



		if (cpol == 0 && cpha == 0)

			cfg_reg109 = 1;

		else if (cpol == 1 && cpha == 0)

			cfg_reg109 = 0;

		geni_write_reg(cfg_reg109, mas->base,

					SE_GENI_CFG_REG109);

		if (!(major == 1 && minor == 0))

			geni_write_reg(1, mas->base, SE_GENI_CFG_SEQ_START);

		cfg_reg108 = geni_read_reg(mas->base, SE_GENI_CFG_REG108);

		cfg_reg109 = geni_read_reg(mas->base, SE_GENI_CFG_REG109);

		cfg_seq_start = geni_read_reg(mas->base, SE_GENI_CFG_SEQ_START);



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

			"%s cfg108: 0x%x cfg109: 0x%x cfg_seq_start: 0x%x\n",

			__func__, cfg_reg108, cfg_reg109, cfg_seq_start);

shared_se:

		if (mas->dis_autosuspend)

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

					"Auto Suspend is disabled\n");
@@ -1739,6 +1800,16 @@ static int spi_geni_probe(struct platform_device *pdev) 
	geni_mas->dis_autosuspend =

		of_property_read_bool(pdev->dev.of_node,

				"qcom,disable-autosuspend");



	geni_mas->set_miso_sampling = of_property_read_bool(pdev->dev.of_node,

				"qcom,set-miso-sampling");

	if (geni_mas->set_miso_sampling) {

		if (!of_property_read_u32(pdev->dev.of_node,

				"qcom,miso-sampling-ctrl-val",

				&geni_mas->miso_sampling_ctrl_val))

			dev_info(&pdev->dev, "MISO_SAMPLING_SET: %d\n",

				geni_mas->miso_sampling_ctrl_val);

	}

	geni_mas->phys_addr = res->start;

	geni_mas->size = resource_size(res);

	geni_mas->base = devm_ioremap(&pdev->dev, res->start,