Commit c8d6a77b authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qup',... 

Merge remote-tracking branches 'spi/topic/pxa2xx', 'spi/topic/qup', 'spi/topic/rockchip', 'spi/topic/st-ssc4' and 'spi/topic/xlp' into spi-next
parents b340941a 280af2b8 d2442287 5de7ed0c 1051550e bf23d191

drivers/spi/Kconfig

+2 −2
Original line number Diff line number Diff line
@@ -580,7 +580,7 @@ config SPI_SIRF 


config SPI_ST_SSC4

	tristate "STMicroelectronics SPI SSC-based driver"

	depends on ARCH_STI

	depends on ARCH_STI || COMPILE_TEST

	help

	  STMicroelectronics SoCs support for SPI. If you say yes to

	  this option, support will be included for the SSC driven SPI.
@@ -667,7 +667,7 @@ config SPI_XILINX 


config SPI_XLP

	tristate "Netlogic XLP SPI controller driver"

	depends on CPU_XLP || COMPILE_TEST

	depends on CPU_XLP || ARCH_VULCAN || COMPILE_TEST

	help

	  Enable support for the SPI controller on the Netlogic XLP SoCs.

	  Currently supported XLP variants are XLP8XX, XLP3XX, XLP2XX, XLP9XX

drivers/spi/spi-pxa2xx-dma.c

+12 −16
Original line number Diff line number Diff line
@@ -33,12 +33,10 @@ static int pxa2xx_spi_map_dma_buffer(struct driver_data *drv_data, 
		dmadev = drv_data->tx_chan->device->dev;

		sgt = &drv_data->tx_sgt;

		buf = drv_data->tx;

		drv_data->tx_map_len = len;

	} else {

		dmadev = drv_data->rx_chan->device->dev;

		sgt = &drv_data->rx_sgt;

		buf = drv_data->rx;

		drv_data->rx_map_len = len;

	}



	nents = DIV_ROUND_UP(len, SZ_2K);
@@ -55,11 +53,7 @@ static int pxa2xx_spi_map_dma_buffer(struct driver_data *drv_data, 
	for_each_sg(sgt->sgl, sg, sgt->nents, i) {

		size_t bytes = min_t(size_t, len, SZ_2K);



		if (buf)

		sg_set_buf(sg, pbuf, bytes);

		else

			sg_set_buf(sg, drv_data->dummy, bytes);



		pbuf += bytes;

		len -= bytes;

	}
@@ -133,9 +127,6 @@ static void pxa2xx_spi_dma_transfer_complete(struct driver_data *drv_data, 
		if (!error) {

			pxa2xx_spi_unmap_dma_buffers(drv_data);



			drv_data->tx += drv_data->tx_map_len;

			drv_data->rx += drv_data->rx_map_len;



			msg->actual_length += drv_data->len;

			msg->state = pxa2xx_spi_next_transfer(drv_data);

		} else {
@@ -267,19 +258,22 @@ irqreturn_t pxa2xx_spi_dma_transfer(struct driver_data *drv_data) 
int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst)

{

	struct dma_async_tx_descriptor *tx_desc, *rx_desc;

	int err = 0;



	tx_desc = pxa2xx_spi_dma_prepare_one(drv_data, DMA_MEM_TO_DEV);

	if (!tx_desc) {

		dev_err(&drv_data->pdev->dev,

			"failed to get DMA TX descriptor\n");

		return -EBUSY;

		err = -EBUSY;

		goto err_tx;

	}



	rx_desc = pxa2xx_spi_dma_prepare_one(drv_data, DMA_DEV_TO_MEM);

	if (!rx_desc) {

		dev_err(&drv_data->pdev->dev,

			"failed to get DMA RX descriptor\n");

		return -EBUSY;

		err = -EBUSY;

		goto err_rx;

	}



	/* We are ready when RX completes */
@@ -289,6 +283,12 @@ int pxa2xx_spi_dma_prepare(struct driver_data *drv_data, u32 dma_burst) 
	dmaengine_submit(rx_desc);

	dmaengine_submit(tx_desc);

	return 0;



err_rx:

	dmaengine_terminate_async(drv_data->tx_chan);

err_tx:

	pxa2xx_spi_unmap_dma_buffers(drv_data);

	return err;

}



void pxa2xx_spi_dma_start(struct driver_data *drv_data)
@@ -308,10 +308,6 @@ int pxa2xx_spi_dma_setup(struct driver_data *drv_data) 
	dma_cap_zero(mask);

	dma_cap_set(DMA_SLAVE, mask);



	drv_data->dummy = devm_kzalloc(dev, SZ_2K, GFP_KERNEL);

	if (!drv_data->dummy)

		return -ENOMEM;



	drv_data->tx_chan = dma_request_slave_channel_compat(mask,

				pdata->dma_filter, pdata->tx_param, dev, "tx");

	if (!drv_data->tx_chan)

drivers/spi/spi-pxa2xx-pci.c

+2 −2
Original line number Diff line number Diff line
@@ -173,8 +173,8 @@ static int pxa2xx_spi_pci_probe(struct pci_dev *dev, 
	ssp->type = c->type;



	snprintf(buf, sizeof(buf), "pxa2xx-spi.%d", ssp->port_id);

	ssp->clk = clk_register_fixed_rate(&dev->dev, buf , NULL,

					CLK_IS_ROOT, c->max_clk_rate);

	ssp->clk = clk_register_fixed_rate(&dev->dev, buf , NULL, 0,

					   c->max_clk_rate);

	 if (IS_ERR(ssp->clk))

		return PTR_ERR(ssp->clk);

drivers/spi/spi-pxa2xx.c

+10 −4
Original line number Diff line number Diff line
@@ -570,9 +570,8 @@ static void giveback(struct driver_data *drv_data) 
		/* see if the next and current messages point

		 * to the same chip

		 */

		if (next_msg && next_msg->spi != msg->spi)

			next_msg = NULL;

		if (!next_msg || msg->state == ERROR_STATE)

		if ((next_msg && next_msg->spi != msg->spi) ||

		    msg->state == ERROR_STATE)

			cs_deassert(drv_data);

	}
@@ -928,6 +927,7 @@ static void pump_transfers(unsigned long data) 
	u32 dma_thresh = drv_data->cur_chip->dma_threshold;

	u32 dma_burst = drv_data->cur_chip->dma_burst_size;

	u32 change_mask = pxa2xx_spi_get_ssrc1_change_mask(drv_data);

	int err;



	/* Get current state information */

	message = drv_data->cur_msg;
@@ -1047,7 +1047,12 @@ static void pump_transfers(unsigned long data) 
		/* Ensure we have the correct interrupt handler */

		drv_data->transfer_handler = pxa2xx_spi_dma_transfer;



		pxa2xx_spi_dma_prepare(drv_data, dma_burst);

		err = pxa2xx_spi_dma_prepare(drv_data, dma_burst);

		if (err) {

			message->status = err;

			giveback(drv_data);

			return;

		}



		/* Clear status and start DMA engine */

		cr1 = chip->cr1 | dma_thresh | drv_data->dma_cr1;
@@ -1555,6 +1560,7 @@ static int pxa2xx_spi_probe(struct platform_device *pdev) 
	master->unprepare_transfer_hardware = pxa2xx_spi_unprepare_transfer;

	master->fw_translate_cs = pxa2xx_spi_fw_translate_cs;

	master->auto_runtime_pm = true;

	master->flags = SPI_MASTER_MUST_RX | SPI_MASTER_MUST_TX;



	drv_data->ssp_type = ssp->type;

drivers/spi/spi-pxa2xx.h

+0 −3
Original line number Diff line number Diff line
@@ -56,7 +56,6 @@ struct driver_data { 
	struct sg_table tx_sgt;

	int rx_nents;

	int tx_nents;

	void *dummy;

	atomic_t dma_running;



	/* Current message transfer state info */
@@ -69,8 +68,6 @@ struct driver_data { 
	void *rx;

	void *rx_end;

	int dma_mapped;

	size_t rx_map_len;

	size_t tx_map_len;

	u8 n_bytes;

	int (*write)(struct driver_data *drv_data);

	int (*read)(struct driver_data *drv_data);