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

Commit a34fc82e authored by Grant Likely's avatar Grant Likely
Browse files

Merge branch 'spi-next' from git://git.kernel.org/pub/scm/linux/kernel/git/broonie/misc.git 

Pull in the changes Mark has queued up for SPI
parents 161b96c3 227c4ce6

Documentation/devicetree/bindings/spi/nvidia,tegra20-sflash.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
NVIDIA Tegra20 SFLASH controller.



Required properties:

- compatible : should be "nvidia,tegra20-sflash".

- reg: Should contain SFLASH registers location and length.

- interrupts: Should contain SFLASH interrupts.

- nvidia,dma-request-selector : The Tegra DMA controller's phandle and

  request selector for this SFLASH controller.



Recommended properties:

- spi-max-frequency: Definition as per

                     Documentation/devicetree/bindings/spi/spi-bus.txt



Example:



spi@7000d600 {

	compatible = "nvidia,tegra20-sflash";

	reg = <0x7000c380 0x80>;

	interrupts = <0 39 0x04>;

	nvidia,dma-request-selector = <&apbdma 16>;

	spi-max-frequency = <25000000>;

	#address-cells = <1>;

	#size-cells = <0>;

	status = "disabled";

};

Documentation/devicetree/bindings/spi/nvidia,tegra20-slink.txt

0 → 100644
+26 −0
Original line number Diff line number Diff line 
NVIDIA Tegra20/Tegra30 SLINK controller.



Required properties:

- compatible : should be "nvidia,tegra20-slink", "nvidia,tegra30-slink".

- reg: Should contain SLINK registers location and length.

- interrupts: Should contain SLINK interrupts.

- nvidia,dma-request-selector : The Tegra DMA controller's phandle and

  request selector for this SLINK controller.



Recommended properties:

- spi-max-frequency: Definition as per

                     Documentation/devicetree/bindings/spi/spi-bus.txt



Example:



slink@7000d600 {

	compatible = "nvidia,tegra20-slink";

	reg = <0x7000d600 0x200>;

	interrupts = <0 82 0x04>;

	nvidia,dma-request-selector = <&apbdma 16>;

	spi-max-frequency = <25000000>;

	#address-cells = <1>;

	#size-cells = <0>;

	status = "disabled";

};

Documentation/devicetree/bindings/spi/omap-spi.txt

+3 −1
Original line number Diff line number Diff line
@@ -6,7 +6,9 @@ Required properties: 
  - "ti,omap4-spi" for OMAP4+.

- ti,spi-num-cs : Number of chipselect supported  by the instance.

- ti,hwmods: Name of the hwmod associated to the McSPI



- ti,pindir-d0-out-d1-in: Select the D0 pin as output and D1 as

			  input. The default is D0 as input and

			  D1 as output.



Example:

drivers/spi/Kconfig

+14 −0
Original line number Diff line number Diff line
@@ -392,6 +392,20 @@ config SPI_MXS 
	help

	  SPI driver for Freescale MXS devices.



config SPI_TEGRA20_SFLASH

	tristate "Nvidia Tegra20 Serial flash Controller"

	depends on ARCH_TEGRA

	help

	  SPI driver for Nvidia Tegra20 Serial flash Controller interface.

	  The main usecase of this controller is to use spi flash as boot

	  device.



config SPI_TEGRA20_SLINK

	tristate "Nvidia Tegra20/Tegra30 SLINK Controller"

	depends on ARCH_TEGRA && TEGRA20_APB_DMA

	help

	  SPI driver for Nvidia Tegra20/Tegra30 SLINK Controller interface.



config SPI_TI_SSP

	tristate "TI Sequencer Serial Port - SPI Support"

	depends on MFD_TI_SSP

drivers/spi/Makefile

+2 −1
Original line number Diff line number Diff line
@@ -61,10 +61,11 @@ obj-$(CONFIG_SPI_SH_MSIOF) += spi-sh-msiof.o 
obj-$(CONFIG_SPI_SH_SCI)		+= spi-sh-sci.o

obj-$(CONFIG_SPI_SIRF)		+= spi-sirf.o

obj-$(CONFIG_SPI_STMP3XXX)		+= spi-stmp.o

obj-$(CONFIG_SPI_TEGRA20_SFLASH)	+= spi-tegra20-sflash.o

obj-$(CONFIG_SPI_TEGRA20_SLINK)		+= spi-tegra20-slink.o

obj-$(CONFIG_SPI_TI_SSP)		+= spi-ti-ssp.o

obj-$(CONFIG_SPI_TLE62X0)		+= spi-tle62x0.o

obj-$(CONFIG_SPI_TOPCLIFF_PCH)		+= spi-topcliff-pch.o

obj-$(CONFIG_SPI_TXX9)			+= spi-txx9.o

obj-$(CONFIG_SPI_XCOMM)		+= spi-xcomm.o

obj-$(CONFIG_SPI_XILINX)		+= spi-xilinx.o