Merge remote-tracking branches 'spi/topic/sirf', 'spi/topic/spidev',...

* CSR SiRFprimaII Serial Peripheral Interface

Required properties:

- compatible : Should be "sirf,prima2-spi"

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

- interrupts : Should contain SPI interrupt

- resets: phandle to the reset controller asserting this device in

          reset

  See ../reset/reset.txt for details.

- dmas : Must contain an entry for each entry in clock-names.

  See ../dma/dma.txt for details.

- dma-names : Must include the following entries:

  - rx

  - tx

- clocks : Must contain an entry for each entry in clock-names.

  See ../clocks/clock-bindings.txt for details.

- #address-cells: Number of cells required to define a chip select

                  address on the SPI bus. Should be set to 1.

- #size-cells:    Should be zero.

Optional properties:

- spi-max-frequency: Specifies maximum SPI clock frequency,

                     Units - Hz. Definition as per

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

- cs-gpios:     should specify GPIOs used for chipselects.

Example:

spi0: spi@b00d0000 {

	compatible = "sirf,prima2-spi";

	reg = <0xb00d0000 0x10000>;

	interrupts = <15>;

	dmas = <&dmac1 9>,

		<&dmac1 4>;

	dma-names = "rx", "tx";

	#address-cells = <1>;

	#size-cells = <0>;

	clocks = <&clks 19>;

	resets = <&rstc 26>;

};

STMicroelectronics SSC (SPI) Controller

---------------------------------------

Required properties:

- compatible	: "st,comms-ssc4-spi"

- reg		: Offset and length of the device's register set

- interrupts	: The interrupt specifier

- clock-names	: Must contain "ssc"

- clocks	: Must contain an entry for each name in clock-names

		    See ../clk/*

- pinctrl-names	: Uses "default", can use "sleep" if provided

		    See ../pinctrl/pinctrl-binding.txt

Optional properties:

- cs-gpios	: List of GPIO chip selects

		    See ../spi/spi-bus.txt

Child nodes represent devices on the SPI bus

  See ../spi/spi-bus.txt

Example:

	spi@9840000 {

		compatible	= "st,comms-ssc4-spi";

		reg		= <0x9840000 0x110>;

		interrupts	= <GIC_SPI 112 IRQ_TYPE_LEVEL_HIGH>;

		clocks		= <&clk_s_c0_flexgen CLK_EXT2F_A9>;

		clock-names	= "ssc";

		pinctrl-0	= <&pinctrl_spi0_default>;

		pinctrl-names	= "default";

		cs-gpios	= <&pio17 5 0>;

		#address-cells	= <1>;

		#size-cells	= <0>;

		st95hf@0{

			compatible		= "st,st95hf";

			reg			= <0>;

			spi-max-frequency	= <1000000>;

			interrupts		= <2 IRQ_TYPE_EDGE_FALLING>;

		};

	};

	help

	  SPI driver for CSR SiRFprimaII SoCs

config SPI_ST_SSC4

	tristate "STMicroelectronics SPI SSC-based driver"

	depends on ARCH_STI

	help

	  STMicroelectronics SoCs support for SPI. If you say yes to

	  this option, support will be included for the SSC driven SPI.

config SPI_SUN4I

	tristate "Allwinner A10 SoCs SPI controller"

	depends on ARCH_SUNXI || COMPILE_TEST

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_ST_SSC4)		+= spi-st-ssc4.o

obj-$(CONFIG_SPI_SUN4I)			+= spi-sun4i.o

obj-$(CONFIG_SPI_SUN6I)			+= spi-sun6i.o

obj-$(CONFIG_SPI_TEGRA114)		+= spi-tegra114.o

static const struct of_device_id spi_sirfsoc_of_match[] = {

	{ .compatible = "sirf,prima2-spi", },

	{ .compatible = "sirf,marco-spi", },

	{}

};

MODULE_DEVICE_TABLE(of, spi_sirfsoc_of_match);