Commit 360b2eae authored by Mark Brown's avatar Mark Brown
Browse files

Merge remote-tracking branches 'spi/fix/au1550', 'spi/fix/davinci',... 

Merge remote-tracking branches 'spi/fix/au1550', 'spi/fix/davinci', 'spi/fix/doc', 'spi/fix/dw', 'spi/fix/omap-mcspi', 'spi/fix/pxa2xx', 'spi/fix/rockchip' and 'spi/fix/rspi' into spi-linus
parents e0a7ab4b 61a2381c 3f2dad99 2c675689 08a707b8 3d0763c0 aca26364 5d1d150d 3819bc87

drivers/spi/spi-au1550.c

+1 −1
Original line number Diff line number Diff line
@@ -945,7 +945,7 @@ static int au1550_spi_remove(struct platform_device *pdev) 
	spi_bitbang_stop(&hw->bitbang);

	free_irq(hw->irq, hw);

	iounmap((void __iomem *)hw->regs);

	release_mem_region(r->start, sizeof(psc_spi_t));

	release_mem_region(hw->ioarea->start, sizeof(psc_spi_t));



	if (hw->usedma) {

		au1550_spi_dma_rxtmp_free(hw);

drivers/spi/spi-davinci.c

+8 −8
Original line number Diff line number Diff line
@@ -417,7 +417,6 @@ static int davinci_spi_setup(struct spi_device *spi) 
						  flags, dev_name(&spi->dev));

			internal_cs = false;

		}

	}



		if (retval) {

			dev_err(&spi->dev, "GPIO %d setup failed (%d)\n",
@@ -427,6 +426,7 @@ static int davinci_spi_setup(struct spi_device *spi) 


		if (internal_cs)

			set_io_bits(dspi->base + SPIPC0, 1 << spi->chip_select);

	}



	if (spi->mode & SPI_READY)

		set_io_bits(dspi->base + SPIPC0, SPIPC0_SPIENA_MASK);

drivers/spi/spi-dw-pci.c

+2 −0
Original line number Diff line number Diff line
@@ -62,6 +62,8 @@ static int spi_pci_probe(struct pci_dev *pdev, 
	if (ret)

		return ret;



	dws->regs = pcim_iomap_table(pdev)[pci_bar];



	dws->bus_num = 0;

	dws->num_cs = 4;

	dws->irq = pdev->irq;

drivers/spi/spi-dw.c

+1 −1
Original line number Diff line number Diff line
@@ -271,7 +271,7 @@ static void giveback(struct dw_spi *dws) 
					transfer_list);



	if (!last_transfer->cs_change)

		spi_chip_sel(dws, dws->cur_msg->spi, 0);

		spi_chip_sel(dws, msg->spi, 0);



	spi_finalize_current_message(dws->master);

}

drivers/spi/spi-omap2-mcspi.c

+2 −1
Original line number Diff line number Diff line
@@ -329,7 +329,8 @@ static void omap2_mcspi_set_fifo(const struct spi_device *spi, 
disable_fifo:

	if (t->rx_buf != NULL)

		chconf &= ~OMAP2_MCSPI_CHCONF_FFER;

	else



	if (t->tx_buf != NULL)

		chconf &= ~OMAP2_MCSPI_CHCONF_FFET;



	mcspi_write_chconf0(spi, chconf);