Commit 5ba838c9 authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/imx',... 

Merge remote-tracking branches 'spi/fix/atmel', 'spi/fix/imx', 'spi/fix/omap2-mcspi', 'spi/fix/ti-qspi' and 'spi/fix/xilinx' into spi-linus
parents 26cc44f8 06515f83 1476253c 468a3208 bc27a539 eca37c7c

drivers/spi/spi-atmel.c

+2 −1
Original line number Diff line number Diff line
@@ -773,7 +773,8 @@ static int atmel_spi_next_xfer_dma_submit(struct spi_master *master, 


	*plen = len;



	if (atmel_spi_dma_slave_config(as, &slave_config, 8))

	if (atmel_spi_dma_slave_config(as, &slave_config,

				       xfer->bits_per_word))

		goto err_exit;



	/* Send both scatterlists */

drivers/spi/spi-imx.c

+7 −0
Original line number Diff line number Diff line
@@ -336,13 +336,20 @@ static int __maybe_unused mx51_ecspi_config(struct spi_imx_data *spi_imx, 


	if (config->mode & SPI_CPHA)

		cfg |= MX51_ECSPI_CONFIG_SCLKPHA(config->cs);

	else

		cfg &= ~MX51_ECSPI_CONFIG_SCLKPHA(config->cs);



	if (config->mode & SPI_CPOL) {

		cfg |= MX51_ECSPI_CONFIG_SCLKPOL(config->cs);

		cfg |= MX51_ECSPI_CONFIG_SCLKCTL(config->cs);

	} else {

		cfg &= ~MX51_ECSPI_CONFIG_SCLKPOL(config->cs);

		cfg &= ~MX51_ECSPI_CONFIG_SCLKCTL(config->cs);

	}

	if (config->mode & SPI_CS_HIGH)

		cfg |= MX51_ECSPI_CONFIG_SSBPOL(config->cs);

	else

		cfg &= ~MX51_ECSPI_CONFIG_SSBPOL(config->cs);



	writel(ctrl, spi_imx->base + MX51_ECSPI_CTRL);

	writel(cfg, spi_imx->base + MX51_ECSPI_CONFIG);

drivers/spi/spi-omap2-mcspi.c

+28 −0
Original line number Diff line number Diff line
@@ -1217,6 +1217,33 @@ out: 
	return status;

}



static int omap2_mcspi_prepare_message(struct spi_master *master,

				       struct spi_message *msg)

{

	struct omap2_mcspi	*mcspi = spi_master_get_devdata(master);

	struct omap2_mcspi_regs	*ctx = &mcspi->ctx;

	struct omap2_mcspi_cs	*cs;



	/* Only a single channel can have the FORCE bit enabled

	 * in its chconf0 register.

	 * Scan all channels and disable them except the current one.

	 * A FORCE can remain from a last transfer having cs_change enabled

	 */

	list_for_each_entry(cs, &ctx->cs, node) {

		if (msg->spi->controller_state == cs)

			continue;



		if ((cs->chconf0 & OMAP2_MCSPI_CHCONF_FORCE)) {

			cs->chconf0 &= ~OMAP2_MCSPI_CHCONF_FORCE;

			writel_relaxed(cs->chconf0,

					cs->base + OMAP2_MCSPI_CHCONF0);

			readl_relaxed(cs->base + OMAP2_MCSPI_CHCONF0);

		}

	}



	return 0;

}



static int omap2_mcspi_transfer_one(struct spi_master *master,

		struct spi_device *spi, struct spi_transfer *t)

{
@@ -1344,6 +1371,7 @@ static int omap2_mcspi_probe(struct platform_device *pdev) 
	master->bits_per_word_mask = SPI_BPW_RANGE_MASK(4, 32);

	master->setup = omap2_mcspi_setup;

	master->auto_runtime_pm = true;

	master->prepare_message = omap2_mcspi_prepare_message;

	master->transfer_one = omap2_mcspi_transfer_one;

	master->set_cs = omap2_mcspi_set_cs;

	master->cleanup = omap2_mcspi_cleanup;

drivers/spi/spi-ti-qspi.c

+1 −2
Original line number Diff line number Diff line
@@ -410,11 +410,10 @@ static int ti_qspi_start_transfer_one(struct spi_master *master, 


	mutex_unlock(&qspi->list_lock);



	ti_qspi_write(qspi, qspi->cmd | QSPI_INVAL, QSPI_SPI_CMD_REG);

	m->status = status;

	spi_finalize_current_message(master);



	ti_qspi_write(qspi, qspi->cmd | QSPI_INVAL, QSPI_SPI_CMD_REG);



	return status;

}

drivers/spi/spi-xilinx.c

+24 −14
Original line number Diff line number Diff line
@@ -270,6 +270,7 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) 


	while (remaining_words) {

		int n_words, tx_words, rx_words;

		u32 sr;



		n_words = min(remaining_words, xspi->buffer_size);
@@ -284,24 +285,33 @@ static int xilinx_spi_txrx_bufs(struct spi_device *spi, struct spi_transfer *t) 
		if (use_irq) {

			xspi->write_fn(cr, xspi->regs + XSPI_CR_OFFSET);

			wait_for_completion(&xspi->done);

		} else

			while (!(xspi->read_fn(xspi->regs + XSPI_SR_OFFSET) &

						XSPI_SR_TX_EMPTY_MASK))

				;



		/* A transmit has just completed. Process received data and

		 * check for more data to transmit. Always inhibit the

		 * transmitter while the Isr refills the transmit register/FIFO,

		 * or make sure it is stopped if we're done.

			/* A transmit has just completed. Process received data

			 * and check for more data to transmit. Always inhibit

			 * the transmitter while the Isr refills the transmit

			 * register/FIFO, or make sure it is stopped if we're

			 * done.

			 */

		if (use_irq)

			xspi->write_fn(cr | XSPI_CR_TRANS_INHIBIT,

				       xspi->regs + XSPI_CR_OFFSET);

			sr = XSPI_SR_TX_EMPTY_MASK;

		} else

			sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);



		/* Read out all the data from the Rx FIFO */

		rx_words = n_words;

		while (rx_words--)

		while (rx_words) {

			if ((sr & XSPI_SR_TX_EMPTY_MASK) && (rx_words > 1)) {

				xilinx_spi_rx(xspi);

				rx_words--;

				continue;

			}



			sr = xspi->read_fn(xspi->regs + XSPI_SR_OFFSET);

			if (!(sr & XSPI_SR_RX_EMPTY_MASK)) {

				xilinx_spi_rx(xspi);

				rx_words--;

			}

		}



		remaining_words -= n_words;

	}