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

Commit 3aad3f03 authored by Linus Torvalds's avatar Linus Torvalds
Browse files

Merge tag 'spi-for-linus' of git://git.secretlab.ca/git/linux 

Pull SPI changes from Grant Likely:
 "Changes to both core spi code and spi device drivers.  The driver
  changes are the usual set of bug fixes and platform enablement.

  Core code changes include:

   - More intelligent assignment of SPI bus numbers when using DT

   - Common mechanism for using gpios as CS lines

   - Pull checks for bits_per_word and transfer speed out of drivers and
     into core code

   - Ensure temporary DMA buffers are DMA safe"

* tag 'spi-for-linus' of git://git.secretlab.ca/git/linux: (50 commits)
  spi: Document cs_gpios and cs_gpio in kernel-doc
  spi/of: Fix initialization of cs_gpios array
  spi/pxa2xx: add support for Lynxpoint SPI controllers
  spi/pxa2xx: add support for Intel Low Power Subsystem SPI
  spi/pxa2xx: add support for SPI_LOOP
  spi/pxa2xx: add support for runtime PM
  spi/pxa2xx: add support for DMA engine
  spi/pxa2xx: break out the private DMA API usage into a separate file
  spi/ath79: add shutdown handler
  spi/mips-lantiq: set SPI_MASTER_HALF_DUPLEX flag
  spi/mips-lantiq: make use of spi_finalize_current_message
  spi/bcm63xx: work around inability to keep CS up
  spi/davinci: use request_threaded_irq() to fix deadlock
  spi/orion: Use module_platform_driver()
  spi/bcm63xx: reject transfers unable to transfer
  spi: Ensure memory used for spi_write_then_read() is DMA safe
  spi/spi-mpc512x-psc: init mode bits supported by the driver
  spi/mpc512x-psc: don't use obsolet cell-index property
  spi: Remove erroneous __init, __exit and __exit_p() references in drivers
  spi/s3c64xx: fix checkpatch warnings and error
  ...
parents 10b6339e 095c3752

Documentation/devicetree/bindings/spi/sh-msiof.txt

0 → 100644
+12 −0
Original line number Diff line number Diff line 
Renesas MSIOF spi controller



Required properties:

- compatible : 	"renesas,sh-msiof" for SuperH or

		"renesas,sh-mobile-msiof" for SH Mobile series

- reg : Offset and length of the register set for the device

- interrupts : interrupt line used by MSIOF



Optional properties:

- num-cs		: total number of chip-selects

- renesas,tx-fifo-size	: Overrides the default tx fifo size given in words

- renesas,rx-fifo-size	: Overrides the default rx fifo size given in words

MAINTAINERS

+1 −0
Original line number Diff line number Diff line
@@ -7168,6 +7168,7 @@ F: drivers/clk/spear/ 


SPI SUBSYSTEM

M:	Grant Likely <grant.likely@secretlab.ca>

M:	Mark Brown <broonie@opensource.wolfsonmicro.com>

L:	spi-devel-general@lists.sourceforge.net

Q:	http://patchwork.kernel.org/project/spi-devel-general/list/

T:	git git://git.secretlab.ca/git/linux-2.6.git

drivers/spi/Kconfig

+13 −2
Original line number Diff line number Diff line
@@ -297,9 +297,20 @@ config SPI_PPC4xx 
	help

	  This selects a driver for the PPC4xx SPI Controller.



config SPI_PXA2XX_PXADMA

	bool "PXA2xx SSP legacy PXA DMA API support"

	depends on SPI_PXA2XX && ARCH_PXA

	help

	  Enable PXA private legacy DMA API support. Note that this is

	  deprecated in favor of generic DMA engine API.



config SPI_PXA2XX_DMA

	def_bool y

	depends on SPI_PXA2XX && !SPI_PXA2XX_PXADMA



config SPI_PXA2XX

	tristate "PXA2xx SSP SPI master"

	depends on (ARCH_PXA || (X86_32 && PCI)) && EXPERIMENTAL

	depends on ARCH_PXA || PCI || ACPI

	select PXA_SSP if ARCH_PXA

	help

	  This enables using a PXA2xx or Sodaville SSP port as a SPI master
@@ -307,7 +318,7 @@ config SPI_PXA2XX 
	  additional documentation can be found a Documentation/spi/pxa2xx.



config SPI_PXA2XX_PCI

	def_bool SPI_PXA2XX && X86_32 && PCI

	def_tristate SPI_PXA2XX && PCI



config SPI_RSPI

	tristate "Renesas RSPI controller"

drivers/spi/Makefile

+4 −1
Original line number Diff line number Diff line
@@ -47,7 +47,10 @@ obj-$(CONFIG_SPI_OMAP24XX) += spi-omap2-mcspi.o 
obj-$(CONFIG_SPI_ORION)			+= spi-orion.o

obj-$(CONFIG_SPI_PL022)			+= spi-pl022.o

obj-$(CONFIG_SPI_PPC4xx)		+= spi-ppc4xx.o

obj-$(CONFIG_SPI_PXA2XX)		+= spi-pxa2xx.o

spi-pxa2xx-platform-objs		:= spi-pxa2xx.o

spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_PXADMA)	+= spi-pxa2xx-pxadma.o

spi-pxa2xx-platform-$(CONFIG_SPI_PXA2XX_DMA)	+= spi-pxa2xx-dma.o

obj-$(CONFIG_SPI_PXA2XX)		+= spi-pxa2xx-platform.o

obj-$(CONFIG_SPI_PXA2XX_PCI)		+= spi-pxa2xx-pci.o

obj-$(CONFIG_SPI_RSPI)			+= spi-rspi.o

obj-$(CONFIG_SPI_S3C24XX)		+= spi-s3c24xx-hw.o

drivers/spi/spi-altera.c

+1 −1
Original line number Diff line number Diff line
@@ -134,7 +134,7 @@ static int altera_spi_txrx(struct spi_device *spi, struct spi_transfer *t) 
	hw->tx = t->tx_buf;

	hw->rx = t->rx_buf;

	hw->count = 0;

	hw->bytes_per_word = (t->bits_per_word ? : spi->bits_per_word) / 8;

	hw->bytes_per_word = t->bits_per_word / 8;

	hw->len = t->len / hw->bytes_per_word;



	if (hw->irq >= 0) {