Commit 81bbadc6 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-v3.17-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi 

Pull spi bugfixes from Mark Brown:
 "A smattering of bug fixes for the SPI subsystem, all in driver code
  which has seen active work recently and none of them with any great
  global impact.

  There's also a new ACPI ID for the pxa2xx driver which required no
  code changes and the addition of kerneldoc for some structure fields
  that were missing it and generating warnings during documentation
  builds as a result"

* tag 'spi-v3.17-rc3-2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi:
  spi: sh-msiof: Fix transmit-only DMA transfers
  spi/rockchip: Avoid accidentally turning off the clock
  spi: dw: fix kernel crash due to NULL pointer dereference
  spi: dw-pci: fix bug when regs left uninitialized
  spi: davinci: fix SPI_NO_CS functionality
  spi/rockchip: fixup incorrect dma direction setting
  spi/pxa2xx: Add ACPI ID for Intel Braswell
  spi: spi-au1550: fix build failure
  spi: rspi: Fix leaking of unused DMA descriptors
  spi: sh-msiof: Fix leaking of unused DMA descriptors
  spi: Add missing kerneldoc bits
  spi/omap-mcspi: Fix the spi task hangs waiting dma_rx
parents 35e27445 2dbf5910

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

CRA Git | Maintained and supported by SUSTech CRA and CCSE